chore: rename assetMan to assetMgr

kroma-network · May 30, 2024 · 561e944 · 561e944
1 parent 0955d54
commit 561e944
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 63 deletions.
diff --git a/op-e2e/actions/l2_challenger_test.go b/op-e2e/actions/l2_challenger_test.go
@@ -147,7 +147,7 @@ interaction:
 		require.NoError(rt.t, err)
 		require.Equal(rt.t, val.StatusRegistered, valStatus)
 
-		afterAsset, err := rt.assetManContract.TotalKroAssets(nil, rt.validator.address)
+		afterAsset, err := rt.assetMgrContract.TotalKroAssets(nil, rt.validator.address)
 		require.NoError(rt.t, err)
 		require.Equal(rt.t, beforeAsset.Uint64()-slashingAmount.Uint64(), afterAsset.Uint64())
 
@@ -243,7 +243,7 @@ interaction:
 		require.NoError(rt.t, err)
 		require.Equal(rt.t, val.StatusRegistered, valStatus)
 
-		afterAsset, err := rt.assetManContract.TotalKroAssets(nil, rt.validator.address)
+		afterAsset, err := rt.assetMgrContract.TotalKroAssets(nil, rt.validator.address)
 		require.NoError(rt.t, err)
 		require.Equal(rt.t, beforeAsset.Uint64()-slashingAmount.Uint64(), afterAsset.Uint64())
 
@@ -337,7 +337,7 @@ interaction:
 		require.NoError(rt.t, err)
 		require.Equal(rt.t, val.StatusRegistered, valStatus)
 
-		afterAsset, err := rt.assetManContract.TotalKroAssets(nil, rt.challenger1.address)
+		afterAsset, err := rt.assetMgrContract.TotalKroAssets(nil, rt.challenger1.address)
 		require.NoError(rt.t, err)
 		require.Equal(rt.t, beforeAsset.Uint64()-slashingAmount.Uint64(), afterAsset.Uint64())
 
@@ -435,7 +435,7 @@ interaction:
 		require.NoError(rt.t, err)
 		require.Equal(rt.t, val.StatusRegistered, valStatus)
 
-		afterAsset, err := rt.assetManContract.TotalKroAssets(nil, rt.challenger1.address)
+		afterAsset, err := rt.assetMgrContract.TotalKroAssets(nil, rt.challenger1.address)
 		require.NoError(rt.t, err)
 		require.Equal(rt.t, beforeAsset.Uint64()-slashingAmount.Uint64(), afterAsset.Uint64())
 
@@ -659,7 +659,7 @@ interaction:
 		require.NoError(rt.t, err)
 		require.True(rt.t, inJail)
 
-		afterAsset, err := rt.assetManContract.TotalKroAssets(nil, rt.validator.address)
+		afterAsset, err := rt.assetMgrContract.TotalKroAssets(nil, rt.validator.address)
 		require.NoError(rt.t, err)
 		require.Equal(rt.t, beforeAsset.Uint64()-slashingAmount.Uint64(), afterAsset.Uint64())
 

diff --git a/op-e2e/actions/l2_runtime.go b/op-e2e/actions/l2_runtime.go
@@ -53,7 +53,7 @@ type Runtime struct {
 	securityCouncilContract  *bindings.SecurityCouncil
 	valPoolContract          *bindings.ValidatorPoolCaller
 	valMgrContract           *bindings.ValidatorManagerCaller
-	assetManContract         *bindings.AssetManagerCaller
+	assetMgrContract         *bindings.AssetManagerCaller
 	assetTokenContract       *bindings.GovernanceTokenCaller
 	targetInvalidBlockNumber uint64
 	outputIndex              *big.Int
@@ -175,10 +175,10 @@ func (rt *Runtime) bindContracts() {
 	rt.valMgrContract, err = bindings.NewValidatorManagerCaller(rt.sd.DeploymentsL1.ValidatorManagerProxy, rt.miner.EthClient())
 	require.NoError(rt.t, err)
 
-	rt.assetManContract, err = bindings.NewAssetManagerCaller(rt.sd.DeploymentsL1.AssetManagerProxy, rt.miner.EthClient())
+	rt.assetMgrContract, err = bindings.NewAssetManagerCaller(rt.sd.DeploymentsL1.AssetManagerProxy, rt.miner.EthClient())
 	require.NoError(rt.t, err)
 
-	assetTokenAddr, err := rt.assetManContract.ASSETTOKEN(nil)
+	assetTokenAddr, err := rt.assetMgrContract.ASSETTOKEN(nil)
 	require.NoError(rt.t, err)
 	rt.assetTokenContract, err = bindings.NewGovernanceTokenCaller(assetTokenAddr, rt.miner.EthClient())
 	require.NoError(rt.t, err)
@@ -355,17 +355,17 @@ func (rt *Runtime) submitL2Output() {
 }
 
 func (rt *Runtime) fetchChallengeAssets(loser common.Address) (*big.Int, *big.Int, *big.Int) {
-	slashingRate, err := rt.assetManContract.SLASHINGRATE(nil)
+	slashingRate, err := rt.assetMgrContract.SLASHINGRATE(nil)
 	require.NoError(rt.t, err)
-	slashingRateDenom, err := rt.assetManContract.SLASHINGRATEDENOM(nil)
+	slashingRateDenom, err := rt.assetMgrContract.SLASHINGRATEDENOM(nil)
 	require.NoError(rt.t, err)
-	taxRate, err := rt.assetManContract.TAXNUMERATOR(nil)
+	taxRate, err := rt.assetMgrContract.TAXNUMERATOR(nil)
 	require.NoError(rt.t, err)
-	taxDenom, err := rt.assetManContract.TAXDENOMINATOR(nil)
+	taxDenom, err := rt.assetMgrContract.TAXDENOMINATOR(nil)
 	require.NoError(rt.t, err)
-	minSlashingAmount, err := rt.assetManContract.MINSLASHINGAMOUNT(nil)
+	minSlashingAmount, err := rt.assetMgrContract.MINSLASHINGAMOUNT(nil)
 	require.NoError(rt.t, err)
-	totalAsset, err := rt.assetManContract.TotalKroAssets(nil, loser)
+	totalAsset, err := rt.assetMgrContract.TotalKroAssets(nil, loser)
 	require.NoError(rt.t, err)
 
 	slashingAmount := new(big.Int).Div(new(big.Int).Mul(totalAsset, slashingRate), slashingRateDenom)

diff --git a/packages/contracts/contracts/test/AssetManager.t.sol b/packages/contracts/contracts/test/AssetManager.t.sol
@@ -151,7 +151,7 @@ contract AssetManagerTest is ValidatorSystemUpgrade_Initializer {
             minSlashingAmount
         );
 
-        address assetManagerAddr = address(assetMan);
+        address assetManagerAddr = address(assetMgr);
 
         vm.prank(multisig);
         Proxy(payable(assetManagerAddr)).upgradeTo(address(assetManagerImpl));

diff --git a/packages/contracts/contracts/test/CommonTest.t.sol b/packages/contracts/contracts/test/CommonTest.t.sol
@@ -205,7 +205,7 @@ contract L2OutputOracle_Initializer is UpgradeGovernor_Initializer {
     // Test target
     ValidatorPool pool;
     ValidatorPool poolImpl;
-    AssetManager assetMan;
+    AssetManager assetMgr;
     AssetManager assetManImpl;
     ValidatorManager valMgr;
     ValidatorManager valMgrImpl;
@@ -291,8 +291,8 @@ contract L2OutputOracle_Initializer is UpgradeGovernor_Initializer {
         // Deploy proxies
         pool = ValidatorPool(address(new Proxy(multisig)));
         vm.label(address(pool), "ValidatorPool");
-        assetMan = AssetManager(address(new Proxy(multisig)));
-        vm.label(address(assetMan), "AssetManager");
+        assetMgr = AssetManager(address(new Proxy(multisig)));
+        vm.label(address(assetMgr), "AssetManager");
         valMgr = ValidatorManager(address(new Proxy(multisig)));
         vm.label(address(valMgr), "ValidatorManager");
         oracle = L2OutputOracle(address(new Proxy(multisig)));
@@ -347,7 +347,7 @@ contract L2OutputOracle_Initializer is UpgradeGovernor_Initializer {
         // Deploy the ValidatorManager
         constructorParams = IValidatorManager.ConstructorParams({
             _l2Oracle: oracle,
-            _assetManager: assetMan,
+            _assetManager: assetMgr,
             _trustedValidator: trusted,
             _commissionRateMinChangeSeconds: commissionRateMinChangeSeconds,
             _roundDurationSeconds: uint128(roundDuration),
@@ -384,7 +384,7 @@ contract L2OutputOracle_Initializer is UpgradeGovernor_Initializer {
         );
 
         vm.prank(multisig);
-        Proxy(payable(address(assetMan))).upgradeTo(address(assetManImpl));
+        Proxy(payable(address(assetMgr))).upgradeTo(address(assetManImpl));
 
         vm.prank(multisig);
         Proxy(payable(address(valMgr))).upgradeTo(address(valMgrImpl));
@@ -403,7 +403,7 @@ contract L2OutputOracle_Initializer is UpgradeGovernor_Initializer {
 
     function _registerValidator(address validator, uint128 assets) internal {
         vm.startPrank(validator);
-        assetToken.approve(address(assetMan), uint256(assets));
+        assetToken.approve(address(assetMgr), uint256(assets));
         valMgr.registerValidator(assets, 10, 5);
         vm.stopPrank();
     }