moving admin argument into initializer

Author: SocksNFlops

src/FulfillmentVault.sol

@@ -96,17 +96,19 @@ contract FulfillmentVault is LiquidityVault, IFulfillmentVault {
    * @param _decimalsOffset The decimals offset for measuring internal precision of shares
    * @param _wrappedNativeToken The address of the wrapped native token
    * @param _generalManager The address of the general manager
+   * @param admin The address of the admin
    */
   function initialize(
     string memory name,
     string memory symbol,
     uint8 _decimals,
     uint8 _decimalsOffset,
     address _wrappedNativeToken,
-    address _generalManager
+    address _generalManager,
+    address admin
   ) external initializer {
     __FulfillmentVault_init(name, symbol, _decimals, _decimalsOffset, _wrappedNativeToken, _generalManager);
-    _grantRole(DEFAULT_ADMIN_ROLE, _msgSender());
+    _grantRole(DEFAULT_ADMIN_ROLE, admin);
   }
 
   /// @inheritdoc IERC165

src/LiquidityVault.sol

@@ -15,8 +15,6 @@ import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/Pau
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-// ToDo: Put admin in the initializer
-
 /**
  * @title LiquidityVault
  * @author @SocksNFlops
@@ -56,7 +54,6 @@ abstract contract LiquidityVault is
     mapping(address => uint256) _depositableAssetIndex;
     address[] _redeemableAssets;
     mapping(address => uint256) _redeemableAssetIndex;
-
     bool _whitelistEnforced;
   }
 
@@ -134,10 +131,11 @@ abstract contract LiquidityVault is
     uint8 _decimals,
     uint8 _decimalsOffset,
     address[] memory _depositableAssets,
-    address[] memory _redeemableAssets
+    address[] memory _redeemableAssets,
+    address admin
   ) external virtual initializer {
     __LiquidityVault_init(name, symbol, _decimals, _decimalsOffset, _depositableAssets, _redeemableAssets);
-    _grantRole(DEFAULT_ADMIN_ROLE, _msgSender());
+    _grantRole(DEFAULT_ADMIN_ROLE, admin);
   }
 
   /// @custom:oz-upgrades-unsafe-allow constructor

src/RolloverVault.sol

@@ -92,16 +92,18 @@ contract RolloverVault is LiquidityVault, IRolloverVault {
    * @param _decimals The decimals of the liquidity vault
    * @param _decimalsOffset The decimals offset for measuring internal precision of shares
    * @param _generalManager The address of the general manager
+   * @param admin The address of the admin
    */
   function initialize(
     string memory name,
     string memory symbol,
     uint8 _decimals,
     uint8 _decimalsOffset,
-    address _generalManager
+    address _generalManager,
+    address admin
   ) external initializer {
     __RolloverVault_init(name, symbol, _decimals, _decimalsOffset, _generalManager);
-    _grantRole(DEFAULT_ADMIN_ROLE, _msgSender());
+    _grantRole(DEFAULT_ADMIN_ROLE, admin);
   }
 
   /// @inheritdoc IERC165

test/FulfillmentVault.t.sol

@@ -172,11 +172,10 @@ contract FulfillmentVaultTest is BaseTest {
       DECIMALS,
       DECIMALS_OFFSET,
       address(whype),
-      address(generalManager)
+      address(generalManager),
+      address(admin)
     );
-    vm.startPrank(admin);
     ERC1967Proxy proxy = new ERC1967Proxy(address(fulfillmentVaultImplementation), initializerData);
-    vm.stopPrank();
     fulfillmentVault = FulfillmentVault(payable(address(proxy)));
 
     // Prime the fulfillmentVault

test/LiquidityVault.t.sol

@@ -64,11 +64,10 @@ contract LiquidityVaultTest is Test {
       DECIMALS,
       DECIMALS_OFFSET,
       depositableAssets,
-      redeemableAssets
+      redeemableAssets,
+      address(admin)
     );
-    vm.startPrank(admin);
     ERC1967Proxy proxy = new ERC1967Proxy(address(liquidityVaultImplementation), initializerData);
-    vm.stopPrank();
     liquidityVault = LiquidityVault(address(proxy));
 
     // Prime the liquidityVault

test/RolloverVault.t.sol

@@ -172,11 +172,10 @@ contract RolloverVaultTest is BaseTest {
       SYMBOL,
       DECIMALS,
       DECIMALS_OFFSET,
-      address(generalManager)
+      address(generalManager),
+      address(admin)
     );
-    vm.startPrank(admin);
     ERC1967Proxy proxy = new ERC1967Proxy(address(rolloverVaultImplementation), initializerData);
-    vm.stopPrank();
     rolloverVault = RolloverVault(payable(address(proxy)));
 
     // Prime the rolloverVault
@@ -259,7 +258,7 @@ contract RolloverVaultTest is BaseTest {
 
   function test_depositOriginationPool_revertsWhenOriginationPoolNotRegistered(address originationPool, uint256 amount) public {
     // Ensure the origination pool is not registered
-    assertFalse(IOriginationPoolScheduler(originationPoolScheduler).isRegistered(originationPool), "Origination pool should not be registered");
+    vm.assume(IOriginationPoolScheduler(originationPoolScheduler).isRegistered(originationPool) == false);
 
     // Keeper pauses the rolloverVault
     vm.startPrank(keeper);