test: separate set of cases for bridge/prove/claim with arbitrary calls

synapsecns · Oct 11, 2024 · 39a84a1 · 39a84a1
1 parent c798dd2
commit 39a84a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/packages/contracts-rfq/test/FastBridgeV2.GasBench.Src.ArbitraryCall.t.sol b/packages/contracts-rfq/test/FastBridgeV2.GasBench.Src.ArbitraryCall.t.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import {FastBridgeV2GasBenchmarkSrcTest} from "./FastBridgeV2.GasBench.Src.t.sol";
+
+// solhint-disable func-name-mixedcase, ordering
+contract FastBridgeV2GasBenchmarkSrcArbitraryCallTest is FastBridgeV2GasBenchmarkSrcTest {
+    function createFixturesV2() public virtual override {
+        super.createFixturesV2();
+        bytes memory mockCallParams = abi.encode(userA, keccak256("Random ID"));
+        setTokenTestCallParams(mockCallParams);
+        setEthTestCallParams(mockCallParams);
+        bridgedTokenTx.callParams = mockCallParams;
+        bridgedEthTx.callParams = mockCallParams;
+        provenTokenTx.callParams = mockCallParams;
+        provenEthTx.callParams = mockCallParams;
+    }
+}
diff --git a/packages/contracts-rfq/test/FastBridgeV2.GasBench.Src.t.sol b/packages/contracts-rfq/test/FastBridgeV2.GasBench.Src.t.sol
@@ -67,10 +67,10 @@ contract FastBridgeV2GasBenchmarkSrcTest is FastBridgeV2SrcBaseTest {
     }
 
     function initExistingTxs() public {
-        bridge({caller: userA, msgValue: 0, params: tokenParams});
-        bridge({caller: userA, msgValue: ethParams.originAmount, params: ethParams});
-        bridge({caller: userA, msgValue: 0, params: tokenParams});
-        bridge({caller: userA, msgValue: ethParams.originAmount, params: ethParams});
+        bridge({caller: userA, msgValue: 0, params: tokenParams, paramsV2: tokenParamsV2});
+        bridge({caller: userA, msgValue: ethParams.originAmount, params: ethParams, paramsV2: ethParamsV2});
+        bridge({caller: userA, msgValue: 0, params: tokenParams, paramsV2: tokenParamsV2});
+        bridge({caller: userA, msgValue: ethParams.originAmount, params: ethParams, paramsV2: ethParamsV2});
         skipBlocksExactly(1);
         prove({caller: relayerA, bridgeTx: provenTokenTx, destTxHash: hex"01"});
         prove({caller: relayerB, transactionId: getTxId(provenEthTx), destTxHash: hex"02", relayer: relayerA});
@@ -103,12 +103,6 @@ contract FastBridgeV2GasBenchmarkSrcTest is FastBridgeV2SrcBaseTest {
     }
 
     function test_bridge_token() public {
-        bridge({caller: userA, msgValue: 0, params: tokenParams});
-        checkAfterBridgeToken();
-    }
-
-    function test_bridge_token_withArbitraryCall() public {
-        setTokenTestCallParams(abi.encode(userB));
         bridge({caller: userA, msgValue: 0, params: tokenParams, paramsV2: tokenParamsV2});
         checkAfterBridgeToken();
     }
@@ -192,12 +186,6 @@ contract FastBridgeV2GasBenchmarkSrcTest is FastBridgeV2SrcBaseTest {
     }
 
     function test_bridge_eth() public {
-        bridge({caller: userA, msgValue: ethParams.originAmount, params: ethParams});
-        checkAfterBridgeEth();
-    }
-
-    function test_bridge_eth_withArbitraryCall() public {
-        setEthTestCallParams(abi.encode(userB));
         bridge({caller: userA, msgValue: ethParams.originAmount, params: ethParams, paramsV2: ethParamsV2});
         checkAfterBridgeEth();
     }