small refactor + cleanup of DeployMockAvs

Layr-Labs · Jun 12, 2024 · 065066c · 065066c
1 parent a630ea1
commit 065066c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 24 deletions.
diff --git a/contracts/anvil/contracts-deployed-anvil-state.json b/contracts/anvil/contracts-deployed-anvil-state.json
diff --git a/contracts/script/DeployMockAvs.s.sol b/contracts/script/DeployMockAvs.s.sol
@@ -17,23 +17,8 @@ contract DeployMockAvs is DeployMockAvsRegistries {
         );
         EigenlayerContracts
             memory eigenlayerContracts = _loadEigenlayerDeployedContracts();
-        string memory opsAddresses = readInput("ops_addresses");
-        MockAvsOpsAddresses memory addressConfig;
-        addressConfig.communityMultisig = stdJson.readAddress(
-            opsAddresses,
-            ".mockAvs.communityMultisig"
-        );
-        addressConfig.pauser = stdJson.readAddress(
-            opsAddresses,
-            ".mockAvs.pauser"
-        );
-        addressConfig.churner = stdJson.readAddress(
-            opsAddresses,
-            ".mockAvs.churner"
-        );
-        addressConfig.ejector = stdJson.readAddress(
-            opsAddresses,
-            ".mockAvs.ejector"
+        MockAvsOpsAddresses memory addressConfig = _loadAvsOpsAddresses(
+            "ops_addresses"
         );
 
         vm.startBroadcast();

diff --git a/contracts/script/DeployMockAvsRegistries.s.sol b/contracts/script/DeployMockAvsRegistries.s.sol
@@ -53,6 +53,21 @@ contract DeployMockAvsRegistries is
         address ejector;
     }
 
+    function _loadAvsOpsAddresses(
+        string memory opsAddressesFileName
+    ) internal view returns (MockAvsOpsAddresses memory) {
+        string memory opsAddresses = readInput(opsAddressesFileName);
+        MockAvsOpsAddresses memory addressConfig;
+        addressConfig.communityMultisig = stdJson.readAddress(
+            opsAddresses,
+            ".communityMultisig"
+        );
+        addressConfig.pauser = stdJson.readAddress(opsAddresses, ".pauser");
+        addressConfig.churner = stdJson.readAddress(opsAddresses, ".churner");
+        addressConfig.ejector = stdJson.readAddress(opsAddresses, ".ejector");
+        return addressConfig;
+    }
+
     function _deploymockAvsRegistryContracts(
         EigenlayerContracts memory eigenlayerContracts,
         MockAvsOpsAddresses memory addressConfig,

diff --git a/contracts/script/input/31337/ops_addresses.json b/contracts/script/input/31337/ops_addresses.json
@@ -1,8 +1,6 @@
 {
-    "mockAvs": {
-        "communityMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-        "pauser": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-        "churner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-        "ejector": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
-    }
+    "communityMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+    "pauser": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+    "churner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+    "ejector": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
 }