Merge branch 'main' into createx-poc

zeta-chain · Aug 5, 2024 · 98e0483 · 98e0483
2 parents 5b84119 + d4910bf
commit 98e0483
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/v2/pkg/zrc20.t.sol/zrc20test.go b/v2/pkg/zrc20.t.sol/zrc20test.go
diff --git a/v2/test/ZRC20.t.sol b/v2/test/ZRC20.t.sol
@@ -142,14 +142,17 @@ contract ZRC20Test is Test, ZRC20Errors {
 
     function testWithdrawGasFee() public {
         vm.prank(fungibleModule);
+        uint256 gasLimit = 10;
+        uint256 protocolFlatFee = 10;
+
         zrc20.updateGasLimit(10);
 
         vm.prank(fungibleModule);
         zrc20.updateProtocolFlatFee(10);
 
         (address gasZRC20, uint256 gasFee) = zrc20.withdrawGasFee();
         assertEq(address(zrc20), gasZRC20);
-        assertEq(20, gasFee);
+        assertEq(gasLimit + protocolFlatFee, gasFee);
     }
 
     function testWithdrawGasFeeFailsIfGasCoinNotSetForChainId() public {
@@ -169,11 +172,14 @@ contract ZRC20Test is Test, ZRC20Errors {
     }
 
     function testWithdraw() public {
+        uint256 gasLimit = 10;
+        uint256 protocolFlatFee = 10;
+
         vm.prank(fungibleModule);
-        zrc20.updateGasLimit(10);
+        zrc20.updateGasLimit(gasLimit);
 
         vm.prank(fungibleModule);
-        zrc20.updateProtocolFlatFee(10);
+        zrc20.updateProtocolFlatFee(protocolFlatFee);
 
         uint256 balanceStart = zrc20.balanceOf(owner);
         assertEq(100_000, balanceStart);
@@ -186,10 +192,10 @@ contract ZRC20Test is Test, ZRC20Errors {
         zrc20.withdraw(abi.encodePacked(addr1), 50_000);
 
         uint256 fungibleModuleBalanceAfter = zrc20.balanceOf(fungibleModule);
-        assertEq(fungibleModuleBalanceStart + 20, fungibleModuleBalanceAfter);
+        assertEq(fungibleModuleBalanceStart + gasLimit + protocolFlatFee, fungibleModuleBalanceAfter);
 
         uint256 balanceAfter = zrc20.balanceOf(owner);
-        assertEq(50_000 - 20, balanceAfter);
+        assertEq(50_000 - gasLimit - protocolFlatFee, balanceAfter);
         uint256 totalSupplyAfter = zrc20.totalSupply();
         assertEq(50_000, totalSupplyAfter);
     }