Merge branch 'shah/deploy-tooling-updates' into shah/deploy-13

OriginProtocol · Jun 7, 2024 · 735ab88 · 735ab88
2 parents e0238fd + 31548d1
commit 735ab88
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/script/deploy/DeployManager.sol b/script/deploy/DeployManager.sol
@@ -24,6 +24,7 @@ contract DeployManager is Script {
 
     constructor() {
         isForked = vm.isContext(VmSafe.ForgeContext.ScriptDryRun) || vm.isContext(VmSafe.ForgeContext.TestGroup);
+        forkFileId = Strings.toString(block.timestamp);
     }
 
     function getDeploymentFilePath() public view returns (string memory) {
@@ -38,9 +39,11 @@ contract DeployManager is Script {
         return string(abi.encodePacked(vm.projectRoot(), "/build/deployments-fork", forkFileId, ".json"));
     }
 
-    function setUp() external {
-        forkFileId = Strings.toString(block.timestamp);
+    function setForkFileId(string memory _forkFileId) external {
+        forkFileId = _forkFileId;
+    }
 
+    function setUp() external {
         string memory chainIdStr = Strings.toString(block.chainid);
         string memory chainIdKey = string(abi.encodePacked(".", chainIdStr));
 

diff --git a/tests/staking/MigratorForkTest.t.sol b/tests/staking/MigratorForkTest.t.sol
@@ -28,6 +28,8 @@ contract MigratorForkTest is Test {
     constructor() {
         deployManager = new DeployManager();
 
+        deployManager.setForkFileId(string(abi.encodePacked(vm.toString(block.chainid), "-MigratorForkTest")));
+
         deployManager.setUp();
         deployManager.run();
     }

diff --git a/tests/staking/OGNRewardsSourceForkTest.t.sol b/tests/staking/OGNRewardsSourceForkTest.t.sol
@@ -34,6 +34,8 @@ contract OGNRewardsSourceForkTest is Test {
     constructor() {
         deployManager = new DeployManager();
 
+        deployManager.setForkFileId(string(abi.encodePacked(vm.toString(block.chainid), "-OGNRewardsSourceForkTest")));
+
         deployManager.setUp();
         deployManager.run();
     }

diff --git a/tests/staking/XOGNStakingForkTest.t..sol b/tests/staking/XOGNStakingForkTest.t..sol
@@ -35,6 +35,8 @@ contract XOGNStakingForkTest is Test {
     constructor() {
         deployManager = new DeployManager();
 
+        deployManager.setForkFileId(string(abi.encodePacked(vm.toString(block.chainid), "-XOGNStakingForkTest")));
+
         deployManager.setUp();
         deployManager.run();
     }

diff --git a/tests/staking/ZapperForkTest.t.sol b/tests/staking/ZapperForkTest.t.sol
@@ -31,6 +31,8 @@ contract ZapperForkTest is Test {
     constructor() {
         deployManager = new DeployManager();
 
+        deployManager.setForkFileId(string(abi.encodePacked(vm.toString(block.chainid), "-ZapperForkTest")));
+
         deployManager.setUp();
         deployManager.run();
     }