rare token L2: disable initializers in constructor; do not grant minter role in initializer; update tests

Author: koteld

contracts/RareTokenL2.sol

@@ -22,10 +22,14 @@ contract SuperRareTokenL2 is
   bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
   bytes32 public constant UPGRADER_ROLE = keccak256("UPGRADER_ROLE");
 
+  /// @custom:oz-upgrades-unsafe-allow constructor
+  constructor() {
+    _disableInitializers();
+  }
+
   /// @notice Initializes the contract with the provided admin and minter addresses.
   /// @param admin The admin address.
-  /// @param minter The minter address.
-  function initialize(address admin, address minter) public initializer {
+  function initialize(address admin) public initializer {
     __ERC20_init("SuperRare", "RARE");
     __ERC20Burnable_init();
     __ERC20Pausable_init();
@@ -35,7 +39,6 @@ contract SuperRareTokenL2 is
 
     _grantRole(DEFAULT_ADMIN_ROLE, admin);
     _grantRole(PAUSER_ROLE, admin);
-    _grantRole(MINTER_ROLE, minter);
     _grantRole(UPGRADER_ROLE, admin);
   }
 

test/RareBridge.t.sol

@@ -36,20 +36,30 @@ contract RareTokenBridgeTest is Test {
   function setUp() public {
     rareToken = new SuperRareToken();
     rareToken.init(tokenOwner);
-    rareTokenL2 = new SuperRareTokenL2();
+
+    SuperRareTokenL2 rareTokenL2Impl = new SuperRareTokenL2();
+    ERC1967Proxy proxyRareTokenL2 = new ERC1967Proxy(
+      address(rareTokenL2Impl),
+      abi.encodeCall(
+        rareTokenL2Impl.initialize,
+        (admin)
+      )
+    );
+    rareTokenL2 = SuperRareTokenL2(address(proxyRareTokenL2));
 
     ccipLocalSimulator = new CCIPLocalSimulator();
     (
-      uint64 chainSelector_,
+      uint64 _chainSelector,
       IRouterClient sourceRouter,
       IRouterClient destinationRouter,
       ,
-      LinkToken linkToken_,
+      LinkToken _linkToken,
       ,
 
     ) = ccipLocalSimulator.configuration();
 
-    linkToken = linkToken_;
+    linkToken = _linkToken;
+    chainSelector = _chainSelector;
 
     MockCCIPRouter(address(sourceRouter)).setFee(ccipFee);
     MockCCIPRouter(address(destinationRouter)).setFee(ccipFee);
@@ -74,18 +84,18 @@ contract RareTokenBridgeTest is Test {
     );
     rareBridgeL2 = RareBridgeBurnAndMint(payable(address(proxyBnM)));
 
-    rareTokenL2.initialize(tokenOwnerL2, address(rareBridgeL2));
+    vm.startPrank(admin);
 
-    chainSelector = chainSelector_;
+    rareTokenL2.grantRole(rareTokenL2.MINTER_ROLE(), address(rareBridgeL2));
 
-    vm.startPrank(admin);
     rareBridge.allowlistRecipient(chainSelector, address(rareBridgeL2), true);
     rareBridge.allowlistSender(chainSelector, address(rareBridgeL2), true);
+    rareBridge.setExtraArgs(chainSelector, 400_000);
+
     rareBridgeL2.allowlistRecipient(chainSelector, address(rareBridge), true);
     rareBridgeL2.allowlistSender(chainSelector, address(rareBridge), true);
-
-    rareBridge.setExtraArgs(chainSelector, 400_000);
     rareBridgeL2.setExtraArgs(chainSelector, 400_000);
+
     vm.stopPrank();
   }