test: reuse deployment scripts in test

axieinfinity · Jan 18, 2024 · 9498c45 · 9498c45
1 parent e421099
commit 9498c45
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 2,400 deletions.
diff --git a/logs/debug.ansi b/logs/debug.ansi
diff --git a/script/GeneralConfig.sol b/script/GeneralConfig.sol
@@ -59,10 +59,10 @@ contract GeneralConfig is BaseGeneralConfig, Utils {
 
       // ronin bridge contracts
       setAddress(DefaultNetwork.Local.key(), Contract.RoninGatewayV3.key(), vm.computeCreateAddress(deployer, 4));
-      setAddress(DefaultNetwork.Local.key(), Contract.RoninBridgeManager.key(), vm.computeCreateAddress(deployer, 5));
-      setAddress(DefaultNetwork.Local.key(), Contract.BridgeTracking.key(), vm.computeCreateAddress(deployer, 7));
-      setAddress(DefaultNetwork.Local.key(), Contract.BridgeSlash.key(), vm.computeCreateAddress(deployer, 9));
-      setAddress(DefaultNetwork.Local.key(), Contract.BridgeReward.key(), vm.computeCreateAddress(deployer, 11));
+      setAddress(DefaultNetwork.Local.key(), Contract.BridgeTracking.key(), vm.computeCreateAddress(deployer, 6));
+      setAddress(DefaultNetwork.Local.key(), Contract.BridgeSlash.key(), vm.computeCreateAddress(deployer, 8));
+      setAddress(DefaultNetwork.Local.key(), Contract.BridgeReward.key(), vm.computeCreateAddress(deployer, 10));
+      setAddress(DefaultNetwork.Local.key(), Contract.RoninBridgeManager.key(), vm.computeCreateAddress(deployer, 11));
 
       //mainchain bridge contracts
       setAddress(DefaultNetwork.Local.key(), Contract.MainchainGatewayV3.key(), vm.computeCreateAddress(deployer, 13));
@@ -75,24 +75,6 @@ contract GeneralConfig is BaseGeneralConfig, Utils {
       setAddress(DefaultNetwork.Local.key(), Contract.AXS.key(), vm.computeCreateAddress(deployer, 16));
       setAddress(DefaultNetwork.Local.key(), Contract.SLP.key(), vm.computeCreateAddress(deployer, 17));
       setAddress(DefaultNetwork.Local.key(), Contract.USDC.key(), vm.computeCreateAddress(deployer, 18));
-
-      console.log("Deployer", deployer);
-      console.log(" > roninGateway", getAddress(DefaultNetwork.Local.key(), Contract.RoninGatewayV3.key()));
-      console.log(" > mainchainGateway", getAddress(DefaultNetwork.Local.key(), Contract.MainchainGatewayV3.key()));
-      console.log(" > bridgeTrackingContract", getAddress(DefaultNetwork.Local.key(), Contract.BridgeTracking.key()));
-      console.log(" > bridgeSlashContract", getAddress(DefaultNetwork.Local.key(), Contract.BridgeSlash.key()));
-      console.log(" > bridgeRewardContract", getAddress(DefaultNetwork.Local.key(), Contract.BridgeReward.key()));
-      console.log(
-        " > roninBridgeManagerContract", getAddress(DefaultNetwork.Local.key(), Contract.RoninBridgeManager.key())
-      );
-      console.log(
-        " > mainchainBridgeManagerContract",
-        getAddress(DefaultNetwork.Local.key(), Contract.MainchainBridgeManager.key())
-      );
-      console.log(" > WETH", getAddress(DefaultNetwork.Local.key(), Contract.WETH.key()));
-      console.log(" > AXS", getAddress(DefaultNetwork.Local.key(), Contract.AXS.key()));
-      console.log(" > SLP", getAddress(DefaultNetwork.Local.key(), Contract.SLP.key()));
-      console.log(" > USDC", getAddress(DefaultNetwork.Local.key(), Contract.USDC.key()));
     }
   }
 

diff --git a/script/Migration.s.sol b/script/Migration.s.sol
@@ -122,15 +122,14 @@ contract Migration is BaseMigration, Utils {
       options[0] = GlobalProposal.TargetOption.GatewayContract;
       targets[0] = loadContract(Contract.MainchainGatewayV3.key());
 
-      param.mainchainBridgeManager.num = 70;
-      param.mainchainBridgeManager.denom = 100;
-      param.mainchainBridgeManager.roninChainId = block.chainid;
-      param.roninBridgeManager.expiryDuration = 60 * 60 * 24 * 14; // 14 days
+      param.mainchainBridgeManager.num = 2;
+      param.mainchainBridgeManager.denom = 4;
+      param.mainchainBridgeManager.roninChainId = 0;
       param.mainchainBridgeManager.bridgeContract = loadContract(Contract.MainchainGatewayV3.key());
       param.mainchainBridgeManager.callbackRegisters = getEmptyAddressArray();
-      param.mainchainBridgeManager.bridgeOperators = getEmptyAddressArray();
-      param.mainchainBridgeManager.governors = getEmptyAddressArray();
-      param.mainchainBridgeManager.voteWeights = getEmptyUint96Array();
+      param.mainchainBridgeManager.bridgeOperators = operatorAddrs;
+      param.mainchainBridgeManager.governors = governorAddrs;
+      param.mainchainBridgeManager.voteWeights = voteWeights;
       param.mainchainBridgeManager.targetOptions = options;
       param.mainchainBridgeManager.targets = targets;
 

diff --git a/script/contracts/MainchainBridgeManagerDeploy.s.sol b/script/contracts/MainchainBridgeManagerDeploy.s.sol
@@ -16,7 +16,6 @@ contract MainchainBridgeManagerDeploy is Migration {
       param.num,
       param.denom,
       param.roninChainId,
-      param.expiryDuration,
       param.bridgeContract,
       param.callbackRegisters,
       param.bridgeOperators,

diff --git a/test/bridge/integration/Base.t.sol → .../bridge/integration/BaseIntegration.t.sol b/test/bridge/integration/Base.t.sol → .../bridge/integration/BaseIntegration.t.sol
@@ -27,7 +27,7 @@ import { AXSDeploy } from "@ronin/script/contracts/token/AXSDeploy.s.sol";
 import { SLPDeploy } from "@ronin/script/contracts/token/SLPDeploy.s.sol";
 import { USDCDeploy } from "@ronin/script/contracts/token/USDCDeploy.s.sol";
 
-contract Base_Integration is Base_Test {
+contract BaseIntegration_Test is Base_Test {
   ISharedArgument.SharedParameter _param;
 
   RoninBridgeManager _roninBridgeManager;
@@ -45,10 +45,10 @@ contract Base_Integration is Base_Test {
 
   function setUp() public virtual {
     _roninGatewayV3 = new RoninGatewayV3Deploy().run();
-    _roninBridgeManager = new RoninBridgeManagerDeploy().run();
     _bridgeTracking = new BridgeTrackingDeploy().run();
     _bridgeSlash = new BridgeSlashDeploy().run();
     _bridgeReward = new BridgeRewardDeploy().run();
+    _roninBridgeManager = new RoninBridgeManagerDeploy().run();
 
     _mainchainGatewayV3 = new MainchainGatewayV3Deploy().run();
     _mainchainBridgeManager = new MainchainBridgeManagerDeploy().run();
@@ -60,6 +60,4 @@ contract Base_Integration is Base_Test {
 
     _param = ISharedArgument(LibSharedAddress.CONFIG).sharedArguments();
   }
-
-  function test_() public { }
 }
diff --git a/test/bridge/integration/bridge-manager/BridgeManagerInterface.sol b/test/bridge/integration/bridge-manager/BridgeManagerInterface.sol
diff --git a/test/bridge/integration/bridge-manager/BridgeManager_IntegrationTest.t.sol b/test/bridge/integration/bridge-manager/BridgeManager_IntegrationTest.t.sol
diff --git a/test/bridge/integration/bridge-manager/set-config/setConfig.MainchainManager.t.sol b/test/bridge/integration/bridge-manager/set-config/setConfig.MainchainManager.t.sol
@@ -1,9 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import "../BridgeManager_IntegrationTest.t.sol";
+import { GlobalProposal } from "@ronin/contracts/libraries/GlobalProposal.sol";
+import { ContractType } from "@ronin/contracts/utils/ContractType.sol";
+import "../../BaseIntegration.t.sol";
 
-contract SetConfig_MainchainManager_Test is Bridge_Integration_Test {
+contract SetConfig_MainchainManager_Test is BaseIntegration_Test {
   function setUp() public virtual override {
     super.setUp();
   }
@@ -16,9 +18,7 @@ contract SetConfig_MainchainManager_Test is Bridge_Integration_Test {
   function test_configBridgeOperatorsCorrectly() external {
     address[] memory bridgeOperators = _mainchainBridgeManager.getBridgeOperators();
 
-    for (uint256 i; i < bridgeOperators.length; i++) {
-      assertEq(bridgeOperators[i], _operators[i].addr);
-    }
+    assertEq(bridgeOperators, _param.mainchainBridgeManager.bridgeOperators);
   }
 
   function test_configTargetsCorrectly() external {
@@ -33,8 +33,8 @@ contract SetConfig_MainchainManager_Test is Bridge_Integration_Test {
 
     assertEq(results[0], address(_mainchainBridgeManager));
     assertEq(results[1], address(_mainchainGatewayV3));
-    assertEq(results[2], address(DEFAULT_ADDRESS));
-    assertEq(results[3], address(DEFAULT_ADDRESS));
-    assertEq(results[4], address(DEFAULT_ADDRESS));
+    assertEq(results[2], address(address(0)));
+    assertEq(results[3], address(address(0)));
+    assertEq(results[4], address(address(0)));
   }
 }
diff --git a/test/bridge/integration/bridge-manager/set-config/setConfig.RoninBridgeManager.t.sol b/test/bridge/integration/bridge-manager/set-config/setConfig.RoninBridgeManager.t.sol
@@ -1,24 +1,24 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import "../BridgeManager_IntegrationTest.t.sol";
+import { GlobalProposal } from "@ronin/contracts/libraries/GlobalProposal.sol";
+import { ContractType } from "@ronin/contracts/utils/ContractType.sol";
+import "../../BaseIntegration.t.sol";
 
-contract SetConfig_RoninBridgeManager_Test is Bridge_Integration_Test {
+contract SetConfig_RoninBridgeManager_Test is BaseIntegration_Test {
   function setUp() public virtual override {
     super.setUp();
   }
 
   function test_configBridgeContractCorrectly() external {
     address bridgeContract = _roninBridgeManager.getContract(ContractType.BRIDGE);
-    assertEq(bridgeContract, address(_roninGatewayV3Contract));
+    assertEq(bridgeContract, address(_roninGatewayV3));
   }
 
   function test_configBridgeOperatorsCorrectly() external {
     address[] memory bridgeOperators = _roninBridgeManager.getBridgeOperators();
 
-    for (uint256 i; i < bridgeOperators.length; i++) {
-      assertEq(bridgeOperators[i], _operators[i].addr);
-    }
+    assertEq(bridgeOperators, _param.roninBridgeManager.bridgeOperators);
   }
 
   function test_configTargetsCorrectly() external {
@@ -32,7 +32,7 @@ contract SetConfig_RoninBridgeManager_Test is Bridge_Integration_Test {
     address[] memory results = _roninBridgeManager.resolveTargets(targets);
 
     assertEq(results[0], address(_roninBridgeManager));
-    assertEq(results[1], address(_roninGatewayV3Contract));
+    assertEq(results[1], address(_roninGatewayV3));
     assertEq(results[2], address(_bridgeSlash));
     assertEq(results[3], address(_bridgeReward));
     assertEq(results[4], address(_bridgeTracking));

diff --git a/test/init-test/DefaultTestConfig.sol b/test/init-test/DefaultTestConfig.sol