chore: updates to use immutable args

defi-wonderland · Oct 31, 2024 · b520ddf · b520ddf
1 parent fcd92e5
commit b520ddf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/packages/contracts-bedrock/contracts/test/invariants/PROPERTIES.md b/packages/contracts-bedrock/contracts/test/invariants/PROPERTIES.md
@@ -14,7 +14,6 @@
 | 4   | an invalid claim should not be redeemable                                           | State transition | [x]     |
 | 5   | for each token, token.balanceOf(L1StandardBridge) == initialBalance - sum of claims | High-level       | [x]     |
 | 6   | OptimismPortal.balance == initialBalance - sum of claims                            | High-level       | [x]     |
-| 7   | balanceClaimer should only be initialized once                                      | Valid state       | [x]     |
 
 
 ## testing methodology

diff --git a/...-bedrock/contracts/test/invariants/balance-claimer/handlers/unguided/BalanceClaimer.t.sol b/...-bedrock/contracts/test/invariants/balance-claimer/handlers/unguided/BalanceClaimer.t.sol
@@ -6,15 +6,6 @@ import {IErc20BalanceWithdrawer} from "contracts/L1/interfaces/winddown/IErc20Ba
 import {IBalanceClaimer} from "contracts/L1/interfaces/winddown/IBalanceClaimer.sol";
 
 contract BalanceClaimerUnguidedHandlers is BalanceClaimerSetup {
-    function handler_initialize(address _ethBalanceWithdrawer, address _erc20BalanceWithdrawer, bytes32 _root)
-        external
-    {
-        // prop-id 7
-        try balanceClaimer.initialize(_ethBalanceWithdrawer, _erc20BalanceWithdrawer, _root) {
-            assert(false); // balanceClaimer should only be initialized once
-        } catch {}
-    }
-
     function handler_claim(
         bytes32[] calldata _proof,
         address _user,
@@ -28,7 +19,7 @@ contract BalanceClaimerUnguidedHandlers is BalanceClaimerSetup {
             //prop-id 1
             assert(ghost_claimInTree[hash]);
             //prop-id 2;
-            assert(!ghost_claimed[_user])
+            assert(!ghost_claimed[_user]);
             ghost_claimed[_user]=true;
         } catch {
             assert(

diff --git a/...es/contracts-bedrock/contracts/test/invariants/balance-claimer/setup/BalanceClaimer.t.sol b/...es/contracts-bedrock/contracts/test/invariants/balance-claimer/setup/BalanceClaimer.t.sol
@@ -35,18 +35,11 @@ contract BalanceClaimerSetup is CommonBase, StdUtils, Claims {
         L1ChugSplashProxy l1StandardBridgeProxy = new L1ChugSplashProxy(address(this));
         Proxy optimismPortalProxy = new Proxy(address(this));
 
-        BalanceClaimer balanceClaimerImpl = new BalanceClaimer();
+        BalanceClaimer balanceClaimerImpl =
+            new BalanceClaimer(address(optimismPortalProxy), address(l1StandardBridgeProxy), tree[0]);
 
         // Set BalanceClaimer implementation
-        balanceClaimerProxy.upgradeToAndCall(
-            address(balanceClaimerImpl),
-            abi.encodeWithSelector(
-                balanceClaimerImpl.initialize.selector,
-                address(optimismPortalProxy),
-                address(l1StandardBridgeProxy),
-                tree[0]
-            )
-        );
+        balanceClaimerProxy.upgradeTo(address(balanceClaimerImpl));
         optimismPortalProxy.upgradeTo(address(optimismPortalImpl));
         l1StandardBridgeProxy.setCode(address(l1StandardBridgeImpl).code);
 
@@ -65,9 +58,9 @@ contract BalanceClaimerSetup is CommonBase, StdUtils, Claims {
     /// @custom:prop sanity checks for setup
     function property_setup() external {
         assert(address(optimismPortal.BALANCE_CLAIMER()) == address(balanceClaimer));
-        assert(address(balanceClaimer.ethBalanceWithdrawer()) == address(optimismPortal));
-        assert(address(balanceClaimer.erc20BalanceWithdrawer()) == address(l1StandardBridge));
+        assert(address(balanceClaimer.ETH_BALANCE_WITHDRAWER()) == address(optimismPortal));
+        assert(address(balanceClaimer.ERC20_BALANCE_WITHDRAWER()) == address(l1StandardBridge));
         assert(address(l1StandardBridge.BALANCE_CLAIMER()) == address(balanceClaimer));
-        assert(balanceClaimer.root() == tree[0]);
+        assert(balanceClaimer.ROOT() == tree[0]);
     }
 }