remove storage, rfk deploys

firstbatchxyz · Dec 23, 2024 · 45b119b · 45b119b
1 parent 9e640f4
commit 45b119b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -208,16 +208,6 @@ Alternatively, you can see a summarized text-only output as well:
 forge coverage --no-match-coverage "(test|mock|script)"
 ```
 
-### Storage Layout
-
-You can print storage layouts for each contract using:
-
-```sh
-./storage.sh
-```
-
-The resulting Markdown files will be created under the [`storage`](./storage/) directory.
-
 ### Gas Snapshot
 
 You can examine the gas usage metrics using the command:

diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -30,15 +30,15 @@ contract DeployLLMOracleRegistry is Script {
         token = address(0x4200000000000000000000000000000000000006); // WETH
     }
 
-    function run() external returns (address proxy, address impl) {
+    function run() public {
         vm.startBroadcast();
-        (proxy, impl) = this.deploy();
+        (address proxy, address impl) = this.deploy();
         vm.stopBroadcast();
 
         helper.writeProxyAddresses("LLMOracleRegistry", proxy, impl);
     }
 
-    function deploy() external returns (address proxy, address impl) {
+    function deploy() public returns (address proxy, address impl) {
         proxy = Upgrades.deployUUPSProxy(
             "LLMOracleRegistry.sol",
             abi.encodeCall(
@@ -49,14 +49,14 @@ contract DeployLLMOracleRegistry is Script {
         impl = Upgrades.getImplementationAddress(proxy);
     }
 
-    function deployUnsafe(address impl) external returns (address proxy) {
-        proxy = UnsafeUpgrades.deployUUPSProxy(
-            impl,
-            abi.encodeCall(
-                LLMOracleRegistry.initialize, (stakes.generator, stakes.validator, token, minRegistrationTimeSec)
-            )
-        );
-    }
+    // function deployUnsafe(address impl) external returns (address proxy) {
+    //     proxy = UnsafeUpgrades.deployUUPSProxy(
+    //         impl,
+    //         abi.encodeCall(
+    //             LLMOracleRegistry.initialize, (stakes.generator, stakes.validator, token, minRegistrationTimeSec)
+    //         )
+    //     );
+    // }
 }
 
 contract DeployLLMOracleCoordinator is Script {
@@ -82,7 +82,7 @@ contract DeployLLMOracleCoordinator is Script {
         token = address(0x4200000000000000000000000000000000000006);
     }
 
-    function run() external returns (address proxy, address impl) {
+    function run() public {
         // read registry address
         string memory deployments = helper.getDeploymentsJson();
         require(vm.keyExistsJson(deployments, "$.LLMOracleRegistry"), "Please deploy LLMOracleRegistry first");
@@ -92,13 +92,13 @@ contract DeployLLMOracleCoordinator is Script {
         require(registryImlp != address(0), "LLMOracleRegistry implementation address is invalid");
 
         vm.startBroadcast();
-        (proxy, impl) = this.deploy(registryProxy);
+        (address proxy, address impl) = this.deploy(registryProxy);
         vm.stopBroadcast();
 
         helper.writeProxyAddresses("LLMOracleCoordinator", proxy, impl);
     }
 
-    function deploy(address registryAddr) external returns (address proxy, address impl) {
+    function deploy(address registryAddr) public returns (address proxy, address impl) {
         proxy = Upgrades.deployUUPSProxy(
             "LLMOracleCoordinator.sol",
             abi.encodeCall(

diff --git a/storage.sh b/storage.sh
diff --git a/test/script/Deploy.t.sol b/test/script/Deploy.t.sol
@@ -22,10 +22,11 @@ contract DeployTest is Test {
 
     function setUp() external {
         deployLLMOracleRegistry = new DeployLLMOracleRegistry();
-        (llmOracleRegistryProxy, llmOracleRegistryImpl) = deployLLMOracleRegistry.run();
+        (llmOracleRegistryProxy, llmOracleRegistryImpl) = deployLLMOracleRegistry.deploy();
 
         deployLLMOracleCoordinator = new DeployLLMOracleCoordinator();
-        (llmOracleCoordinatorProxy, llmOracleCoordinatorImpl) = deployLLMOracleCoordinator.run();
+        (llmOracleCoordinatorProxy, llmOracleCoordinatorImpl) =
+            deployLLMOracleCoordinator.deploy(llmOracleRegistryProxy);
     }
 
     modifier deployed() {