fix tests

multiversx · Oct 18, 2024 · ef221a3 · ef221a3
1 parent cd453f0
commit ef221a3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/bridge-proxy/sc-config.toml b/bridge-proxy/sc-config.toml
@@ -4,4 +4,7 @@
 path = "../multi-transfer-esdt/src/bridge_proxy_contract_proxy.rs"
 
 [[proxy]]
-path = "../multisig/src/bridge_proxy_contract_proxy.rs"
+path = "../multisig/src/bridge_proxy_contract_proxy.rs"
+
+[[proxy]]
+path = "./src/bridge_proxy_contract_proxy.rs"
diff --git a/bridge-proxy/scenarios/bridge_proxy_execute_crowdfunding.scen.json b/bridge-proxy/scenarios/bridge_proxy_execute_crowdfunding.scen.json
@@ -190,7 +190,8 @@
                 ],
                 "function": "deposit",
                 "arguments": [
-                    "0x30313032303330343035303630373038303931300000000000000000050063726f7766756e64696e675f5f5f5f5f5f5f5f5f5f5f0000000d4252494447452d3132333435360000000201f4000000000000000101000000150000000466756e6400000000009896800100000000"
+                    "0x30313032303330343035303630373038303931300000000000000000050063726f7766756e64696e675f5f5f5f5f5f5f5f5f5f5f0000000d4252494447452d3132333435360000000201f4000000000000000101000000150000000466756e6400000000009896800100000000",
+                    "0x01"
                 ],
                 "gasLimit": "5,000,000"
             },

diff --git a/bridge-proxy/src/bridge_proxy_contract_proxy.rs b/bridge-proxy/src/bridge_proxy_contract_proxy.rs
@@ -87,13 +87,16 @@ where
 {
     pub fn deposit<
         Arg0: ProxyArg<transaction::EthTransaction<Env::Api>>,
+        Arg1: ProxyArg<u64>,
     >(
         self,
         eth_tx: Arg0,
+        batch_id: Arg1,
     ) -> TxTypedCall<Env, From, To, (), Gas, ()> {
         self.wrapped_tx
             .raw_call("deposit")
             .argument(&eth_tx)
+            .argument(&batch_id)
             .original_result()
     }
 
@@ -110,16 +113,12 @@ where
             .original_result()
     }
 
-    pub fn cancel<
-        Arg0: ProxyArg<usize>,
-    >(
+    pub fn update_lowest_tx_id(
         self,
-        tx_id: Arg0,
     ) -> TxTypedCall<Env, From, To, NotPayable, Gas, ()> {
         self.wrapped_tx
             .payment(NotPayable)
-            .raw_call("cancel")
-            .argument(&tx_id)
+            .raw_call("updateLowestTxId")
             .original_result()
     }
 

diff --git a/bridge-proxy/tests/bridge_proxy_blackbox_test.rs b/bridge-proxy/tests/bridge_proxy_blackbox_test.rs
@@ -271,7 +271,7 @@ fn bridge_proxy_execute_crowdfunding_test() {
         .from(MULTI_TRANSFER_ADDRESS)
         .to(BRIDGE_PROXY_ADDRESS)
         .typed(bridge_proxy_contract_proxy::BridgeProxyContractProxy)
-        .deposit(&eth_tx)
+        .deposit(&eth_tx, 1u64)
         .egld_or_single_esdt(
             &EgldOrEsdtTokenIdentifier::esdt(BRIDGE_TOKEN_ID),
             0,
@@ -352,7 +352,7 @@ fn multiple_deposit_test() {
         .from(MULTI_TRANSFER_ADDRESS)
         .to(BRIDGE_PROXY_ADDRESS)
         .typed(bridge_proxy_contract_proxy::BridgeProxyContractProxy)
-        .deposit(&eth_tx1)
+        .deposit(&eth_tx1, 1u64)
         .single_esdt(
             &TokenIdentifier::from(BRIDGE_TOKEN_ID),
             0u64,
@@ -365,7 +365,7 @@ fn multiple_deposit_test() {
         .from(MULTI_TRANSFER_ADDRESS)
         .to(BRIDGE_PROXY_ADDRESS)
         .typed(bridge_proxy_contract_proxy::BridgeProxyContractProxy)
-        .deposit(&eth_tx2)
+        .deposit(&eth_tx2, 1u64)
         .single_esdt(
             &TokenIdentifier::from(BRIDGE_TOKEN_ID),
             0u64,
@@ -464,7 +464,7 @@ fn test_lowest_tx_id() {
             .from(MULTI_TRANSFER_ADDRESS)
             .to(BRIDGE_PROXY_ADDRESS)
             .typed(bridge_proxy_contract_proxy::BridgeProxyContractProxy)
-            .deposit(tx)
+            .deposit(tx, 1u64)
             .single_esdt(
                 &TokenIdentifier::from(BRIDGE_TOKEN_ID),
                 0u64,

diff --git a/multisig/scenarios/ethereum_to_multiversx_relayer_call_data_several_tx_test.scen.json b/multisig/scenarios/ethereum_to_multiversx_relayer_call_data_several_tx_test.scen.json
@@ -43,6 +43,7 @@
                 "arguments": [
                     "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "0x000000000000000005006d756c74692d7472616e736665725f5f5f5f5f5f5f5f",
+                    "0x000000000000000005006272696467652d70726f78795f5f5f5f5f5f5f5f5f5f",
                     "0x0249f0"
                 ],
                 "gasLimit": "5,000,000"

diff --git a/multisig/scenarios/ethereum_to_multiversx_relayer_query2_test.scen.json b/multisig/scenarios/ethereum_to_multiversx_relayer_query2_test.scen.json
@@ -43,6 +43,7 @@
                 "arguments": [
                     "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "0x000000000000000005006d756c74692d7472616e736665725f5f5f5f5f5f5f5f",
+                    "0x000000000000000005006272696467652d70726f78795f5f5f5f5f5f5f5f5f5f",
                     "0x0249f0"
                 ],
                 "gasLimit": "5,000,000"

diff --git a/multisig/scenarios/ethereum_to_multiversx_relayer_query_test.scen.json b/multisig/scenarios/ethereum_to_multiversx_relayer_query_test.scen.json
@@ -43,6 +43,7 @@
                 "arguments": [
                     "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "0x000000000000000005006d756c74692d7472616e736665725f5f5f5f5f5f5f5f",
+                    "0x000000000000000005006272696467652d70726f78795f5f5f5f5f5f5f5f5f5f",
                     "0x0249f0"
                 ],
                 "gasLimit": "5,000,000"

diff --git a/multisig/scenarios/ethereum_to_multiversx_tx_batch_ok_call_data_encoded.scen.json b/multisig/scenarios/ethereum_to_multiversx_tx_batch_ok_call_data_encoded.scen.json
@@ -43,6 +43,7 @@
                 "arguments": [
                     "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "0x000000000000000005006d756c74692d7472616e736665725f5f5f5f5f5f5f5f",
+                    "0x000000000000000005006272696467652d70726f78795f5f5f5f5f5f5f5f5f5f",
                     "0x0249f0"
                 ],
                 "gasLimit": "5,000,000"