fix changes in tests

AryanGodara · Apr 15, 2024 · 4380e1a · 4380e1a
1 parent 4f045bc
commit 4380e1a
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 118 deletions.
diff --git a/rpc/mock_test.go b/rpc/mock_test.go
@@ -197,24 +197,58 @@ func mock_starknet_getTransactionByBlockIdAndIndex(result interface{}, method st
 		return errWrongArgs
 	}
 
-	var InvokeTxnV1example = `{
-		"transaction_hash": "0x705547f8f2f8fdfb10ed533d909f76482bb293c5a32648d476774516a0bebd0",
+	var InvokeTxnV3Example = `{
 		"type": "INVOKE",
-		"nonce": "0x0",
-		"max_fee": "0x53685de02fa5",
-		"version": "0x1",
+		"sender_address": "0x143fe26927dd6a302522ea1cd6a821ab06b3753194acee38d88a85c93b3cbc6",
+		"calldata": [
+			"0x1",
+			"0x6b74c515944ef1ef630ee1cf08a22e110c39e217fa15554a089182a11f78ed",
+			"0xc844fd57777b0cd7e75c8ea68deec0adf964a6308da7a58de32364b7131cc8",
+			"0x13",
+			"0x41bbf1eff2ac123d9e01004a385329369cbc1c309838562f030b3faa2caa4",
+			"0x54103",
+			"0x7e430a7a59836b5969859b25379c640a8ccb66fb142606d7acb1a5563c2ad9",
+			"0x6600d829",
+			"0x103020400000000000000000000000000000000000000000000000000000000",
+			"0x4",
+			"0x5f5e100",
+			"0x5f60fc2",
+			"0x5f60fc2",
+			"0x5f6570d",
+			"0xa07695b6574c60c37",
+			"0x1",
+			"0x2",
+			"0x7afe11c6cdf846e8e33ff55c6e8310293b81aa58da4618af0c2fb29db2515c7",
+			"0x1200966b0f9a5cd1bf7217b202c3a4073a1ff583e4779a3a3ffb97a532fe0c",
+			"0x2cb74dff29a13dd5d855159349ec92f943bacf0547ff3734e7d84a15d08cbc5",
+			"0x460769330eab4b3269a5c07369382fcc09fbfc92458c63f77292425c72272f9",
+			"0x10ebdb197fd1017254b927b01073c64a368db45534413b539895768e57b72ba",
+			"0x2e7dc996ebf724c1cf18d668fc3455df4245749ebc0724101cbc6c9cb13c962"
+		],
+		"version": "0x3",
 		"signature": [
-		"0x4a7849de7b91e52cd0cdaf4f40aa67f54a58e25a15c60e034d2be819c1ecda4",
-		"0x227fcad2a0007348e64384649365e06d41287b1887999b406389ee73c1d8c4c"
+			"0x665f0c67ed4d9565f63857b1a55974b98b2411f579c53c9f903fd21a3edb3d1",
+			"0x549c4480aba4753c58f757c92b5a1d3d67b2ced4bf06076825af3f52f738d6d"
 		],
-		"sender_address": "0x315e364b162653e5c7b23efd34f8da27ba9c069b68e3042b7d76ce1df890313",
-		"calldata": [
-				   "0x1",
-				   "0x13befe6eda920ce4af05a50a67bd808d67eee6ba47bb0892bef2d630eaf1bba"
-		]
-		}`
-
-	if err := json.Unmarshal([]byte(InvokeTxnV1example), r); err != nil {
+		"nonce": "0x359d",
+		"resource_bounds": {
+			"l1_gas": {
+				"max_amount": "0x3bb2",
+				"max_price_per_unit": "0x2ba7def30000"
+			},
+			"l2_gas": {
+				"max_amount": "0x0",
+				"max_price_per_unit": "0x0"
+			}
+		},
+		"tip": "0x0",
+		"paymaster_data": [],
+		"account_deployment_data": [],
+		"nonce_data_availability_mode": "L1",
+		"fee_data_availability_mode": "L1"
+	}`
+
+	if err := json.Unmarshal([]byte(InvokeTxnV3Example), r); err != nil {
 		return err
 	}
 	return nil
@@ -269,45 +303,21 @@ func mock_starknet_getTransactionByHash(result interface{}, method string, args
 		return errWrongArgs
 	}
 
-	var InvokeTxnV1example = `    {
-		"transaction_hash": "0x1779df1c6de5136ad2620f704b645e9cbd554b57d37f08a06ea60142269c5a5",
-		"version": "0x1",
-		"max_fee": "0x17970b794f000",
+	var DeclareTnxV2Example = `{
+		"type": "DECLARE",
+		"sender_address": "0x5fd4befee268bf6880f955875cbed3ade8346b1f1e149cc87b317e62b6db569",
+		"compiled_class_hash": "0x7130f75fc2f1400813d1e96ea7ebee334b568a87b645a62aade0eb2fa2cf252",
+		"max_fee": "0x4a0fbb2d7a43",
+		"version": "0x2",
 		"signature": [
-		  "0xe500c4014c055c3304d8a125cfef44638ffa5b0f6840916049667a4c38aa1c",
-		  "0x45ac538bfce5d8c5741b4421bbdc99f5849451acae75d2048d7cc4bb029ca77"
-		],
-		"nonce": "0x2d",
-		"sender_address": "0x66dd340c03b6b7866fa7bb4bb91cc9e9c2a8eedc321985f334fd55de5e4e071",
-		"calldata": [
-		  "0x3",
-		  "0x39a04b968d794fb076b0fbb146c12b48a23aa785e3d2e5be1982161f7536218",
-		  "0x2f0b3c5710379609eb5495f1ecd348cb28167711b73609fe565a72734550354",
-		  "0x0",
-		  "0x3",
-		  "0x3207980cd08767c9310d197c38b1a58b2a9bceb61dd9a99f51b407798702991",
-		  "0x2f0b3c5710379609eb5495f1ecd348cb28167711b73609fe565a72734550354",
-		  "0x3",
-		  "0x3",
-		  "0x42969068f9e84e9bf1c7bb6eb627455287e58f866ba39e45b123f9656aed5e9",
-		  "0x2f0b3c5710379609eb5495f1ecd348cb28167711b73609fe565a72734550354",
-		  "0x6",
-		  "0x3",
-		  "0x9",
-		  "0x47487560da4c5c5755897e527a5fda37422b5ba02a2aba1ca3ce2b24dfd142e",
-		  "0xde0b6b3a7640000",
-		  "0x0",
-		  "0x47487560da4c5c5755897e527a5fda37422b5ba02a2aba1ca3ce2b24dfd142e",
-		  "0x10f0cf064dd59200000",
-		  "0x0",
-		  "0x47487560da4c5c5755897e527a5fda37422b5ba02a2aba1ca3ce2b24dfd142e",
-		  "0x21e19e0c9bab2400000",
-		  "0x0"
+		   "0x5569787df42fece1184537b0d480900a403386355b9d6a59e7c7a7e758287f0",
+		   "0x2acaeea2e0817da33ed5dbeec295b0177819b5a5a50b0a669e6eecd88e42e92"
 		],
-		"type": "INVOKE"
-	  }`
+		"nonce": "0x16e",
+		"class_hash": "0x79b7ec8fdf40a4ff6ed47123049dfe36b5c02db93aa77832682344775ef70c6"
+	}`
 
-	if err := json.Unmarshal([]byte(InvokeTxnV1example), r); err != nil {
+	if err := json.Unmarshal([]byte(DeclareTnxV2Example), r); err != nil {
 		return err
 	}
 	return nil
@@ -334,15 +344,16 @@ func mock_starknet_getTransactionReceipt(result interface{}, method string, args
 
 	arg0Felt := args[0].(*felt.Felt)
 
-	testTxnHash, err := utils.HexToFelt("0x4b861c47d0fbc4cc24dacf92cf155ad0a2f7e2a0fd9b057b90cdd64eba7e12e")
+	testTxnHash, err := utils.HexToFelt("0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b")
 	if err != nil {
 		return err
 	}
 	if arg0Felt.Equal(testTxnHash) {
+
 		var txnRec struct {
 			Result UnknownTransactionReceipt `json:"result"`
 		}
-		read, err := os.ReadFile("tests/receipt/0x4b861c47d0fbc4cc24dacf92cf155ad0a2f7e2a0fd9b057b90cdd64eba7e12e.json")
+		read, err := os.ReadFile("tests/receipt/0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b.json")
 		if err != nil {
 			return err
 		}
@@ -354,6 +365,7 @@ func mock_starknet_getTransactionReceipt(result interface{}, method string, args
 		if err != nil {
 			return err
 		}
+
 		return json.Unmarshal(txnReceipt, &r)
 	}
 

diff --git a/rpc/tests/receipt/0x4b861c47d0fbc4cc24dacf92cf155ad0a2f7e2a0fd9b057b90cdd64eba7e12e.json b/rpc/tests/receipt/0x4b861c47d0fbc4cc24dacf92cf155ad0a2f7e2a0fd9b057b90cdd64eba7e12e.json
diff --git a/rpc/tests/receipt/0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b.json b/rpc/tests/receipt/0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b.json
@@ -0,0 +1,49 @@
+{
+    "jsonrpc": "2.0",
+    "result": {
+        "actual_fee": {
+            "amount": "0x16409a78a10b00",
+            "unit": "FRI"
+        },
+        "block_hash": "0x4ae5d52c75e4dea5694f456069f830cfbc7bec70427eee170c3385f751b8564",
+        "block_number": 52767,
+        "events": [
+            {
+                "data": [
+                    "0x3028044a4c4df95c0b0a907307c6feffa76b9c38e83088ade29b186a250eb13",
+                    "0x3",
+                    "0x17a393a5e943cec833c8a8f4cbbf7c58361fb2fdd9caa0c36d901eedec4938e",
+                    "0x776731d30bd922ac0390edfc664ed31b232aa7c7ce389c333e34c6b32957532",
+                    "0x40851db0ebaebb9f8a18eda25005c050793f2a69e9e7d1f44bc133752898918"
+                ],
+                "from_address": "0x243d436e1f7cea085aaa42834975488029b1ebf67cea1d2e86f7de58e7d34a3",
+                "keys": [
+                    "0x15bd0500dc9d7e69ab9577f73a8d753e8761bed10f25ba0f124254dc4edb8b4"
+                ]
+            },
+            {
+                "data": [
+                    "0x6016d919abf2ddefe03dacc2ff5c8f42eb80cf65add1e90dd73c5c5e06ef3e2",
+                    "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
+                    "0x16409a78a10b00",
+                    "0x0"
+                ],
+                "from_address": "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
+                "keys": [
+                    "0x99cd8bde557814842a3121e8ddfd433a539b8c9f14bf31ebf108d12e6196e9"
+                ]
+            }
+        ],
+        "execution_resources": {
+            "ec_op_builtin_applications": 3,
+            "pedersen_builtin_applications": 24,
+            "range_check_builtin_applications": 152,
+            "steps": 5774
+        },
+        "execution_status": "SUCCEEDED",
+        "finality_status": "ACCEPTED_ON_L1",
+        "messages_sent": [],
+        "transaction_hash": "0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b",
+        "type": "INVOKE"
+    }
+}
diff --git a/rpc/transaction_test.go b/rpc/transaction_test.go
@@ -149,7 +149,7 @@ func TestTransactionByBlockIdAndIndex(t *testing.T) {
 	testSet := map[string][]testSetType{
 		"mock": {
 			{
-				BlockID:     WithBlockNumber(300000),
+				BlockID:     WithBlockHash(utils.TestHexToFelt(t, "0x4ae5d52c75e4dea5694f456069f830cfbc7bec70427eee170c3385f751b8564")),
 				Index:       0,
 				ExpectedTxn: InvokeTxnV3example,
 			},
@@ -192,8 +192,6 @@ func TestTransactionReceipt(t *testing.T) {
 	}
 	var receiptTxn52767_16 = InvokeTransactionReceipt(CommonTransactionReceipt{
 		TransactionHash: utils.TestHexToFelt(t, "0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b"),
-		BlockHash:       utils.TestHexToFelt(t, "0x4ae5d52c75e4dea5694f456069f830cfbc7bec70427eee170c3385f751b8564"),
-		BlockNumber:     52767,
 		ActualFee: FeePayment{
 			Amount: utils.TestHexToFelt(t, "0x16409a78a10b00"),
 			Unit:   UnitStrk,
@@ -217,15 +215,15 @@ func TestTransactionReceipt(t *testing.T) {
 				},
 			},
 			{
-				FromAddress: utils.TestHexToFelt(t, "0x243d436e1f7cea085aaa42834975488029b1ebf67cea1d2e86f7de58e7d34a3"),
+				FromAddress: utils.TestHexToFelt(t, "0x4718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"),
 				Data: []*felt.Felt{
 					utils.TestHexToFelt(t, "0x6016d919abf2ddefe03dacc2ff5c8f42eb80cf65add1e90dd73c5c5e06ef3e2"),
 					utils.TestHexToFelt(t, "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8"),
 					utils.TestHexToFelt(t, "0x16409a78a10b00"),
 					utils.TestHexToFelt(t, "0x0"),
 				},
 				Keys: []*felt.Felt{
-					utils.TestHexToFelt(t, "0x15bd0500dc9d7e69ab9577f73a8d753e8761bed10f25ba0f124254dc4edb8b4"),
+					utils.TestHexToFelt(t, "0x99cd8bde557814842a3121e8ddfd433a539b8c9f14bf31ebf108d12e6196e9"),
 				},
 			},
 		},
@@ -236,6 +234,10 @@ func TestTransactionReceipt(t *testing.T) {
 				ECOPApps:       3,
 				RangeCheckApps: 152,
 			},
+			DataAvailability: DataAvailability{
+				L1Gas:     0,
+				L1DataGas: 128,
+			},
 		},
 	})
 
@@ -279,7 +281,16 @@ func TestTransactionReceipt(t *testing.T) {
 	})
 
 	testSet := map[string][]testSetType{
-		"mock": {},
+		"mock": {
+			{
+				TxnHash: utils.TestHexToFelt(t, "0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b"),
+				ExpectedResp: TransactionReceiptWithBlockInfo{
+					TransactionReceipt: receiptTxn52767_16,
+					BlockNumber:        52767,
+					BlockHash:          utils.TestHexToFelt(t, "0x4ae5d52c75e4dea5694f456069f830cfbc7bec70427eee170c3385f751b8564"),
+				},
+			},
+		},
 		"testnet": {
 			{
 				TxnHash: utils.TestHexToFelt(t, "0xf2f3d50192637e8d5e817363460c39d3a668fe12f117ecedb9749466d8352b"),
@@ -307,9 +318,7 @@ func TestTransactionReceipt(t *testing.T) {
 		testConfig.provider.c = spy
 		txReceiptWithBlockInfo, err := testConfig.provider.TransactionReceipt(context.Background(), test.TxnHash)
 		require.Nil(t, err)
-		require.Equal(t, txReceiptWithBlockInfo.BlockNumber, test.ExpectedResp.BlockNumber)
-		require.Equal(t, txReceiptWithBlockInfo.BlockHash, test.ExpectedResp.BlockHash)
-
+		require.Equal(t, test.ExpectedResp, txReceiptWithBlockInfo)
 	}
 }
 

diff --git a/rpc/types_transaction_receipt.go b/rpc/types_transaction_receipt.go
@@ -25,8 +25,6 @@ const (
 type CommonTransactionReceipt struct {
 	// TransactionHash The hash identifying the transaction
 	TransactionHash *felt.Felt `json:"transaction_hash"`
-	BlockHash       *felt.Felt `json:"block_hash,omitempty"`
-	BlockNumber     uint       `json:"block_number,omitempty"`
 	// ActualFee The fee that was charged by the sequencer
 	ActualFee       FeePayment         `json:"actual_fee"`
 	ExecutionStatus TxnExecutionStatus `json:"execution_status"`