cleanup

Author: javadkh2

src/Chainweb.sol

@@ -11,7 +11,7 @@ interface IChainwebChainId {
     function getChainId() external view returns (uint32);
 }
 
-abstract contract Chainweb is CommonBase {
+contract Chainweb is CommonBase {
     uint24 private _numberOfChains;
     uint256 private _chainIdOffset;
     uint24 private _chainwebChainIdOffset;
@@ -211,7 +211,7 @@ abstract contract ChainwebTest is Chainweb, Test {
     }
 }
 
-contract ChainwebScript is Chainweb, ChainwebConfigReader, Script {
+abstract contract ChainwebScript is Chainweb, ChainwebConfigReader, Script {
     Chainweb public chainweb;
     ChainwebConfig private config;
 

test/Chainweb.t.sol

@@ -62,31 +62,31 @@ contract ChainwebPluginTest is ChainwebTest(2, 0) {
         assertEq(uint256(stored), chainId, "Storage slot 0 does not match chainId");
     }
 
-    // function test_setupChainsForScript() public {
-    //     Chainweb newChainweb = new Chainweb(vm, 2, block.chainid, 0, "");
-    //     newChainweb.setupChainsForScript();
-    //     string memory hostUrl = newChainweb.getHostUrl();
-    //     assertEq(hostUrl, "");
-
-    //     // After setup, should be able to switch to both chains
-    //     uint256[] memory chainIds = newChainweb.getChainIds();
-    //     for (uint256 i = 0; i < chainIds.length; i++) {
-    //         // This will revert if setupChainsForScript did not set up forks
-    //         newChainweb.switchChain(chainIds[i]);
-    //         uint256 activeChainId = newChainweb.getActiveChainId();
-    //         assertEq(activeChainId, chainIds[i]);
-    //     }
-    // }
-
-    // function test_getHostUrl() public {
-    //     // getHostUrl() should return the host URL set in the Chainweb constructor
-    //     // The default in ChainwebTest is "" (empty string)
-    //     assertEq(chainweb.getHostUrl(), "");
-    //     // Deploy a new Chainweb with a custom host URL and check
-    //     string memory customUrl = "http://localhost:8080";
-    //     Chainweb customChainweb = new Chainweb(4, block.chainid, 0, customUrl);
-    //     assertEq(customChainweb.getHostUrl(), customUrl);
-    // }
+    function test_setupChainsForScript() public {
+        Chainweb newChainweb = new Chainweb(2, block.chainid, 0, "");
+        newChainweb.setupChainsForScript();
+        string memory hostUrl = newChainweb.getHostUrl();
+        assertEq(hostUrl, "");
+
+        // After setup, should be able to switch to both chains
+        uint256[] memory chainIds = newChainweb.getChainIds();
+        for (uint256 i = 0; i < chainIds.length; i++) {
+            // This will revert if setupChainsForScript did not set up forks
+            newChainweb.switchChain(chainIds[i]);
+            uint256 activeChainId = newChainweb.getActiveChainId();
+            assertEq(activeChainId, chainIds[i]);
+        }
+    }
+
+    function test_getHostUrl() public {
+        // getHostUrl() should return the host URL set in the Chainweb constructor
+        // The default in ChainwebTest is "" (empty string)
+        assertEq(chainweb.getHostUrl(), "");
+        // Deploy a new Chainweb with a custom host URL and check
+        string memory customUrl = "http://localhost:8080";
+        Chainweb customChainweb = new Chainweb(4, block.chainid, 0, customUrl);
+        assertEq(customChainweb.getHostUrl(), customUrl);
+    }
 
     function test_ActiveChainId() public {
         uint256[] memory chainIds = chainweb.getChainIds();