Fix tx receipt tests

software-mansion · Jan 16, 2024 · ec00b37 · ec00b37
1 parent 1eaca7e
commit ec00b37
Showing 1 changed file with 56 additions and 23 deletions.
diff --git a/Tests/StarknetTests/Data/TransactionReceiptTests.swift b/Tests/StarknetTests/Data/TransactionReceiptTests.swift
@@ -6,52 +6,64 @@ let invokeReceipt = """
 {
     "type": "INVOKE",
     "transaction_hash": "0x333198614194ae5b5ef921e63898a592de5e9f4d7b6e04745093da88b429f2a",
-    "actual_fee": "0x244adfc7e22",
+    "actual_fee": {
+                    "amount": "0x244adfc7e22",
+                    "unit": "FRI"
+                },
     "block_hash": "0x3e1833c6f0bd56a041e150f74e2f5026157d8d3d890ab386eac58c9776da284",
     "block_number": 308391,
     "messages_sent": [],
     "events": [],
     "execution_status": "SUCCEEDED",
     "finality_status": "ACCEPTED_ON_L2",
-    "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"}
+    "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1}
 }
 """
 let pendingInvokeReceipt = """
 {
     "type": "INVOKE",
     "transaction_hash": "0x333198614194ae5b5ef921e63898a592de5e9f4d7b6e04745093da88b429f2a",
-    "actual_fee": "0x244adfc7e22",
+    "actual_fee": {
+                    "amount": "0x244adfc7e22",
+                    "unit": "FRI"
+                },
     "messages_sent": [],
     "events": [],
     "execution_status": "SUCCEEDED",
     "finality_status": "ACCEPTED_ON_L2",
-    "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"}
+    "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1}
 }
 """
 let declareReceipt = """
 {
     "type": "DECLARE",
     "transaction_hash": "0x333198614194ae5b5ef921e63898a592de5e9f4d7b6e04745093da88b429f2a",
-    "actual_fee": "0x244adfc7e22",
+    "actual_fee": {
+                    "amount": "0x244adfc7e22",
+                    "unit": "FRI"
+                },
     "block_hash": "0x3e1833c6f0bd56a041e150f74e2f5026157d8d3d890ab386eac58c9776da284",
     "block_number": 308391,
     "messages_sent": [],
     "events": [],
     "execution_status": "SUCCEEDED",
     "finality_status": "ACCEPTED_ON_L2",
-    "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"}
+    "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1}
 }
 """
 let pendingDeclareReceipt = """
 {
     "type": "DECLARE",
     "transaction_hash": "0x333198614194ae5b5ef921e63898a592de5e9f4d7b6e04745093da88b429f2a",
-    "actual_fee": "0x244adfc7e22",
-    "messages_sent": [],
+    "actual_fee": {
+                    "amount": "0x244adfc7e22",
+                    "unit": "FRI"
+                },
+	"messages_sent": [],
     "events": [],
     "execution_status": "SUCCEEDED",
     "finality_status": "ACCEPTED_ON_L2",
-    "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"}
+    "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1}
 }
 """
 let deployAccountReceipt = """
@@ -60,25 +72,31 @@ let deployAccountReceipt = """
     "transaction_hash": "0x333198614194ae5b5ef921e63898a592de5e9f4d7b6e04745093da88b429f2a",
     "block_hash": "0x3e1833c6f0bd56a041e150f74e2f5026157d8d3d890ab386eac58c9776da284",
     "block_number": 308391,
-    "actual_fee": "0x244adfc7e22",
+    "actual_fee": {
+                    "amount": "0x244adfc7e22",
+                    "unit": "FRI"
+                },
     "messages_sent": [],
     "events": [],
     "execution_status": "SUCCEEDED",
     "finality_status": "ACCEPTED_ON_L2",
-    "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"},
+    "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1},
     "contract_address": "0x789"
 }
 """
 let pendingDeployAccountReceipt = """
 {
     "type": "DEPLOY_ACCOUNT",
     "transaction_hash": "0x333198614194ae5b5ef921e63898a592de5e9f4d7b6e04745093da88b429f2a",
-    "actual_fee": "0x244adfc7e22",
+    "actual_fee": {
+                    "amount": "0x244adfc7e22",
+                    "unit": "FRI"
+                },
     "messages_sent": [],
     "events": [],
     "execution_status": "SUCCEEDED",
     "finality_status": "ACCEPTED_ON_L2",
-    "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"},
+    "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1},
     "contract_address": "0x789"
 }
 """
@@ -88,12 +106,15 @@ let deployReceipt = """
     "transaction_hash": "0x333198614194ae5b5ef921e63898a592de5e9f4d7b6e04745093da88b429f2a",
     "block_hash": "0x3e1833c6f0bd56a041e150f74e2f5026157d8d3d890ab386eac58c9776da284",
     "block_number": 308391,
-    "actual_fee": "0x244adfc7e22",
+    "actual_fee": {
+                    "amount": "0x244adfc7e22",
+                    "unit": "FRI"
+                },
     "messages_sent": [],
     "events": [],
     "execution_status": "SUCCEEDED",
     "finality_status": "ACCEPTED_ON_L2",
-    "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"},
+    "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1},
     "contract_address": "0x789"
 }
 """
@@ -103,25 +124,31 @@ let l1HandlerReceipt = """
     "transaction_hash": "0x333198614194ae5b5ef921e63898a592de5e9f4d7b6e04745093da88b429f2a",
     "block_hash": "0x3e1833c6f0bd56a041e150f74e2f5026157d8d3d890ab386eac58c9776da284",
     "block_number": 308391,
-    "actual_fee": "0x244adfc7e22",
+    "actual_fee": {
+                    "amount": "0x244adfc7e22",
+                    "unit": "FRI"
+                },    
     "messages_sent": [],
     "events": [],
     "execution_status": "SUCCEEDED",
     "finality_status": "ACCEPTED_ON_L2",
-    "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"},
+    "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1},
     "message_hash":"0x2137"
 }
 """
 let pendingL1HandlerReceipt = """
 {
     "type": "L1_HANDLER",
     "transaction_hash": "0x333198614194ae5b5ef921e63898a592de5e9f4d7b6e04745093da88b429f2a",
-    "actual_fee": "0x244adfc7e22",
+    "actual_fee": {
+                    "amount": "0x244adfc7e22",
+                    "unit": "FRI"
+                },
     "messages_sent": [],
     "events": [],
     "execution_status": "SUCCEEDED",
     "finality_status": "ACCEPTED_ON_L2",
-    "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"},
+    "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1},
     "message_hash":"0x2137"
 }
 """
@@ -162,7 +189,10 @@ final class TransactionReceiptTests: XCTestCase {
         {
             "type": "INVOKE",
             "transaction_hash": "0x157438780a13f8cdfa5c291d666361c112ac0082751fac480e520a7bd78af6d",
-            "actual_fee": "0x39f4339b931a",
+            "actual_fee": {
+                                "amount": "0x244adfc7e22",
+                                "unit": "FRI"
+                            },
             "block_hash": "0x3e1833c6f0bd56a041e150f74e2f5026157d8d3d890ab386eac58c9776da284",
             "block_number": 308391,
             "messages_sent": [
@@ -206,7 +236,7 @@ final class TransactionReceiptTests: XCTestCase {
             ],
             "execution_status": "SUCCEEDED",
             "finality_status": "ACCEPTED_ON_L1",
-            "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"}
+            "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1}
         }
         """.data(using: .utf8)!
 
@@ -226,15 +256,18 @@ final class TransactionReceiptTests: XCTestCase {
         {
             "type": "INVOKE",
             "transaction_hash": "0x5e2e61a59e3f254f2c65109344be985dff979abd01b9c15b659a95f466689bf",
-            "actual_fee": "0x48cca53dbe80",
+            "actual_fee": {
+                            "amount": "0x244adfc7e22",
+                            "unit": "FRI"
+                        },
             "block_hash": "0x5bc1f6c8303014894a8ba111e6af811b4a1c5a87044312a5ef5f38355b4745a",
             "block_number": 304950,
             "messages_sent": [],
             "events": [],
             "revert_reason": "Error in the called contract (0x03b1b7a7ae9a136a327b01b89ddfee24a474c74bf76032876b5754e44cd7040b):\\nError at pc=0:32:\\nGot an exception while executing a hint: Custom Hint Error: Requested contract address ContractAddress(PatriciaKey(StarkFelt(\\"0x0000000000000000000000000000000000000000000000000000000000000042\\"))) is not deployed.\\nCairo traceback (most recent call last):\\nUnknown location (pc=0:557)\\nUnknown location (pc=0:519)\\nUnknown location (pc=0:625)\\n",
             "execution_status": "REVERTED",
             "finality_status": "ACCEPTED_ON_L1",
-            "execution_resources": {"steps": "0x999", "memory_holes" : "0x1", "range_check_builtin_applications": "0x21", "pedersen_builtin_applications": "0x37", "poseidon_builtin_applications": "0x451", "ec_op_builtin_applications": "0x123", "ecdsa_builtin_applications": "0x789", "bitwise_builtin_applications": "0x0", "keccak_builtin_applications": "0xd"}
+            "execution_resources": {"steps": 999, "memory_holes" : 1, "range_check_builtin_applications": 21, "pedersen_builtin_applications": 37, "poseidon_builtin_applications": 451, "ec_op_builtin_applications": 123, "ecdsa_builtin_applications": 789, "bitwise_builtin_applications": 1, "keccak_builtin_applications": 1}
         }
         """.data(using: .utf8)!