G-01 fix removing old initialize function

Author: thedarkjester

contracts/contracts/messageService/l2/L2MessageManager.sol

@@ -14,6 +14,8 @@ import { Utils } from "../../lib/Utils.sol";
 abstract contract L2MessageManager is AccessControlUpgradeable, IL2MessageManager, L2MessageManagerV1 {
   using Utils for *;
 
+  bytes32 public constant L1_L2_MESSAGE_SETTER_ROLE = keccak256("L1_L2_MESSAGE_SETTER_ROLE");
+
   uint256 public lastAnchoredL1MessageNumber;
   mapping(uint256 messageNumber => bytes32 rollingHash) public l1RollingHashes;
 

contracts/contracts/messageService/l2/v1/L2MessageManagerV1.sol

@@ -15,8 +15,6 @@ abstract contract L2MessageManagerV1 is Initializable, L2MessageServicePauseMana
   uint8 public constant INBOX_STATUS_RECEIVED = 1;
   uint8 public constant INBOX_STATUS_CLAIMED = 2;
 
-  bytes32 public constant L1_L2_MESSAGE_SETTER_ROLE = keccak256("L1_L2_MESSAGE_SETTER_ROLE");
-
   /**
    * @dev Mapping to store L1->L2 message hashes status.
    * @dev messageHash => messageStatus (0: unknown, 1: received, 2: claimed).
@@ -32,14 +30,6 @@ abstract contract L2MessageManagerV1 is Initializable, L2MessageServicePauseMana
 
   /// @dev Total contract storage is 1 slot.
 
-  /**
-   * @notice Initialises L2 message manager contract.
-   * @param _l1l2MessageSetter The address owning the L1_L2_MESSAGE_SETTER_ROLE role.
-   */
-  function __L2MessageManager_init(address _l1l2MessageSetter) internal onlyInitializing {
-    _grantRole(L1_L2_MESSAGE_SETTER_ROLE, _l1l2MessageSetter);
-  }
-
   /**
    * @notice Update the status of L1->L2 message when a user claims a message on L2.
    * @param _messageHash Hash of the message.

contracts/contracts/test-contracts/TestL2MessageManager.sol

@@ -29,16 +29,12 @@ contract TestL2MessageManager is Initializable, L2MessageManager, IGenericErrors
     __ERC165_init();
     __Context_init();
     __AccessControl_init();
-    __L2MessageManager_init(_l1l2MessageSetter);
     __PauseManager_init(_pauseTypeRoles, _unpauseTypeRoles);
 
     _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
     _grantRole(PAUSE_ALL_ROLE, _pauserManager);
     _grantRole(UNPAUSE_ALL_ROLE, _pauserManager);
-  }
-
-  function tryInitialize(address _l1l2MessageSetter) external {
-    __L2MessageManager_init(_l1l2MessageSetter);
+    _grantRole(L1_L2_MESSAGE_SETTER_ROLE, _l1l2MessageSetter);
   }
 
   function updateL1L2MessageStatusToClaimed(bytes32 _messageHash) external {

contracts/test/L2MessageManager.ts

@@ -7,7 +7,6 @@ import {
   DEFAULT_ADMIN_ROLE,
   GENERAL_PAUSE_TYPE,
   HASH_ZERO,
-  INITIALIZED_ERROR_MESSAGE,
   L1_L2_MESSAGE_SETTER_ROLE,
   pauseTypeRoles,
   unpauseTypeRoles,
@@ -46,12 +45,11 @@ describe("L2MessageManager", () => {
   });
 
   describe("Initialization checks", () => {
-    it("Deployer has default admin role", async () => {
+    it("Deployer has DEFAULT_ADMIN_ROLE", async () => {
       expect(await l2MessageManager.hasRole(DEFAULT_ADMIN_ROLE, admin.address)).to.be.true;
     });
-
-    it("It should fail when not initializing", async () => {
-      await expectRevertWithReason(l2MessageManager.tryInitialize(admin.address), INITIALIZED_ERROR_MESSAGE);
+    it("l1l2MessageSetter has L1_L2_MESSAGE_SETTER_ROLE", async () => {
+      expect(await l2MessageManager.hasRole(L1_L2_MESSAGE_SETTER_ROLE, l1l2MessageSetter.address)).to.be.true;
     });
   });