Deploy only once for fork tests

OriginProtocol · May 22, 2024 · 427ef88 · 427ef88
1 parent 8c38ba2
commit 427ef88
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,5 +16,5 @@ out/
 .vscode
 brownie-deploy/
 .idea
-deployments-fork.json
+deployments-fork*.json
 broadcast/*
diff --git a/script/deploy/DeployManager.sol b/script/deploy/DeployManager.sol
@@ -14,6 +14,8 @@ contract DeployManager is Script {
     mapping(string => address) public deployedContracts;
     mapping(string => bool) public scriptsExecuted;
 
+    string internal forkFileId = "";
+
     function isForked() public view returns (bool) {
         return vm.isContext(VmSafe.ForgeContext.ScriptDryRun) || vm.isContext(VmSafe.ForgeContext.Test)
             || vm.isContext(VmSafe.ForgeContext.TestGroup);
@@ -28,10 +30,12 @@ contract DeployManager is Script {
     }
 
     function getForkDeploymentFilePath() public view returns (string memory) {
-        return string(abi.encodePacked(vm.projectRoot(), "/build/deployments-fork.json"));
+        return string(abi.encodePacked(vm.projectRoot(), "/build/deployments-fork-", forkFileId, ".json"));
     }
 
     function setUp() external {
+        forkFileId = Strings.toString(block.timestamp);
+
         string memory chainIdStr = Strings.toString(block.chainid);
         string memory chainIdKey = string(abi.encodePacked(".", chainIdStr));
 

diff --git a/tests/governance/XOGNGovernanceForkTest.t.sol b/tests/governance/XOGNGovernanceForkTest.t.sol
@@ -32,12 +32,14 @@ contract XOGNGovernanceForkTest is Test {
 
     int256 constant NEW_STAKE = -1;
 
-    function setUp() external {
+    constructor() {
         deployManager = new DeployManager();
 
         deployManager.setUp();
         deployManager.run();
+    }
 
+    function setUp() external {
         xogn = ExponentialStaking(deployManager.getDeployment("XOGN"));
         timelock = Timelock(payable(Addresses.TIMELOCK));
         xognGov = Governance(payable(deployManager.getDeployment("XOGN_GOV")));

diff --git a/tests/staking/MigratorForkTest.t.sol b/tests/staking/MigratorForkTest.t.sol
@@ -24,12 +24,14 @@ contract MigratorForkTest is Test {
 
     address public ogvWhale = Addresses.GOV_MULTISIG;
 
-    function setUp() external {
+    constructor() {
         deployManager = new DeployManager();
 
         deployManager.setUp();
         deployManager.run();
+    }
 
+    function setUp() external {
         migrator = Migrator(deployManager.getDeployment("MIGRATOR"));
 
         veogv = OgvStaking(Addresses.VEOGV);

diff --git a/tests/staking/OGNRewardsSourceForkTest.t.sol b/tests/staking/OGNRewardsSourceForkTest.t.sol
@@ -31,12 +31,14 @@ contract OGNRewardsSourceForkTest is Test {
 
     int256 constant NEW_STAKE = -1;
 
-    function setUp() external {
+    constructor() {
         deployManager = new DeployManager();
 
         deployManager.setUp();
         deployManager.run();
+    }
 
+    function setUp() external {
         xogn = ExponentialStaking(deployManager.getDeployment("XOGN"));
         timelock = Timelock(payable(Addresses.TIMELOCK));
         xognGov = Governance(payable(deployManager.getDeployment("XOGN_GOV")));

diff --git a/tests/staking/XOGNStakingForkTest.t..sol b/tests/staking/XOGNStakingForkTest.t..sol
@@ -32,12 +32,14 @@ contract XOGNStakingForkTest is Test {
 
     int256 constant NEW_STAKE = -1;
 
-    function setUp() external {
+    constructor() {
         deployManager = new DeployManager();
 
         deployManager.setUp();
         deployManager.run();
+    }
 
+    function setUp() external {
         xogn = ExponentialStaking(deployManager.getDeployment("XOGN"));
         timelock = Timelock(payable(Addresses.TIMELOCK));
         xognGov = Governance(payable(deployManager.getDeployment("XOGN_GOV")));