fix tests

matter-labs · Mar 15, 2024 · 5a3986f · 5a3986f
1 parent f78390a
commit 5a3986f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/l1-contracts/contracts/bridge/L1SharedBridge.sol b/l1-contracts/contracts/bridge/L1SharedBridge.sol
@@ -182,7 +182,8 @@ contract L1SharedBridge is IL1SharedBridge, ReentrancyGuard, Initializable, Owna
     function bridgehubDeposit(
         uint256 _chainId,
         address _prevMsgSender,
-        uint256, // l2Value, needed for Weth deposits in the future
+        // solhint-disable-next-line no-unused-vars
+        uint256 _l2Value, // l2Value, needed for Weth deposits in the future
         bytes calldata _data
     ) external payable override onlyBridgehub returns (L2TransactionRequestTwoBridgesInner memory request) {
         require(l2BridgeAddress[_chainId] != address(0), "ShB l2 bridge not deployed");

diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Deposit.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/Deposit.t.sol
@@ -78,7 +78,7 @@ contract DepositTest is L1Erc20BridgeTest {
         bytes32 txHash = bridge.deposit({
             _l2Receiver: randomSigner,
             _l1Token: address(token),
-            _amount: 0,
+            _amount: amount,
             _l2TxGasLimit: 0,
             _l2TxGasPerPubdataByte: 0,
             _refundRecipient: address(0)

diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridge.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridge.t.sol
@@ -641,7 +641,7 @@ contract L1SharedBridgeTest is Test {
         emit WithdrawalFinalizedSharedBridge(ERA_CHAIN_ID, alice, ETH_TOKEN_ADDRESS, amount);
         sharedBridge.finalizeWithdrawal({
             _chainId: ERA_CHAIN_ID,
-            _l2BatchNumber: l2BatchNumber,
+            _l2BatchNumber: legacyBatchNumber,
             _l2MessageIndex: l2MessageIndex,
             _l2TxNumberInBatch: l2TxNumberInBatch,
             _message: message,

diff --git a/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeFails.t.sol
@@ -603,7 +603,7 @@ contract L1SharedBridgeFailTest is Test {
         vm.expectRevert("ShB not enough funds 2");
 
         sharedBridge.finalizeWithdrawal({
-            _chainId: ERA_CHAIN_ID,
+            _chainId: chainId,
             _l2BatchNumber: l2BatchNumber,
             _l2MessageIndex: l2MessageIndex,
             _l2TxNumberInBatch: l2TxNumberInBatch,
@@ -645,7 +645,7 @@ contract L1SharedBridgeFailTest is Test {
         vm.expectRevert("ShB withd w proof");
 
         sharedBridge.finalizeWithdrawal({
-            _chainId: ERA_CHAIN_ID,
+            _chainId: chainId,
             _l2BatchNumber: l2BatchNumber,
             _l2MessageIndex: l2MessageIndex,
             _l2TxNumberInBatch: l2TxNumberInBatch,
@@ -667,7 +667,7 @@ contract L1SharedBridgeFailTest is Test {
 
         vm.expectRevert("ShB wrong msg len");
         sharedBridge.finalizeWithdrawal({
-            _chainId: ERA_CHAIN_ID,
+            _chainId: chainId,
             _l2BatchNumber: l2BatchNumber,
             _l2MessageIndex: l2MessageIndex,
             _l2TxNumberInBatch: l2TxNumberInBatch,