test: update tests

Author: javadkh2

examples/Counter/script/Counter.s.sol

@@ -14,6 +14,7 @@ contract CounterScript is ChainwebScript {
             vm.startBroadcast();
             Counter counter1 = new Counter();
             counter1.setNumber(1);
+            console.log("counter1", address(counter1));
             vm.stopBroadcast();
         }
 

test/Chainweb.t.sol

@@ -13,7 +13,12 @@ contract SimpleContract {
     }
 }
 
-contract ChainwebPluginTest is ChainwebTest(2, 0) {
+contract ChainwebContractTest is Test {
+    Chainweb public chainweb;
+    function setUp() public {
+        chainweb = new Chainweb(2, block.chainid, 0, "");
+        chainweb.setupChainsForTest();
+    }
     function test_readChainwebConfig_anvil() public {
         ChainwebConfigReader reader = new ChainwebConfigReader();
         ChainwebConfig memory config = reader.readChainwebConfig("anvil");
@@ -35,33 +40,6 @@ contract ChainwebPluginTest is ChainwebTest(2, 0) {
         assertTrue(bytes(config.externalHostUrl).length > 0, "externalHostUrl should be string");
     }
 
-    function test_deployChainWebChainIdContract() public {
-        uint256[] memory chainIds = chainweb.getChainIds();
-        uint256 chainId = chainIds[0];
-        chainweb.switchChain(chainId);
-
-        // Confirm initial value
-        uint256 activeChainId = chainweb.getActiveChainId();
-        assertEq(activeChainId, chainId);
-
-        // Now deploy a new chainweb chain id contract with a different value
-        //uint256 newChainId = 9999;
-        chainweb.deployChainWebChainIdContract(chainId);
-
-        // Check that code exists at the precompile address
-        address precompile = chainweb.CHAIN_ID_PRECOMPILE();
-        uint256 codeSize;
-        assembly {
-            codeSize := extcodesize(precompile)
-        }
-        assertGt(codeSize, 0, "No code at CHAIN_ID_PRECOMPILE");
-
-        // Use vm.load to read storage slot 0
-        bytes32 stored;
-        stored = vm.load(precompile, bytes32(uint256(0)));
-        assertEq(uint256(stored), chainId, "Storage slot 0 does not match chainId");
-    }
-
     function test_setupChainsForScript() public {
         Chainweb newChainweb = new Chainweb(2, block.chainid, 0, "");
         newChainweb.setupChainsForScript();
@@ -88,15 +66,12 @@ contract ChainwebPluginTest is ChainwebTest(2, 0) {
         assertEq(customChainweb.getHostUrl(), customUrl);
     }
 
-    function test_ActiveChainId() public {
+    function test_getChainIds() public view {
+        //Chainweb chainweb = new Chainweb(2, block.chainid, 0, "");
         uint256[] memory chainIds = chainweb.getChainIds();
-        console.log("chains.length", chainIds.length);
         for (uint256 i = 0; i < chainIds.length; i++) {
-            console.log("i:", i);
-            chainweb.switchChain(chainIds[i]);
-            uint256 activeChainId = chainweb.getActiveChainId();
-            assertEq(activeChainId, chainIds[i]);
-            console.log("Active chain ID:", activeChainId);
+            assertEq(chainIds[i], i);
+            console.log("Chain ID:", chainIds[i]);
         }
     }
 
@@ -112,15 +87,47 @@ contract ChainwebPluginTest is ChainwebTest(2, 0) {
         }
     }
 
-    function test_getChainIds() public view {
-        //Chainweb chainweb = new Chainweb(2, block.chainid, 0, "");
+    function test_ActiveChainId() public {
         uint256[] memory chainIds = chainweb.getChainIds();
+        console.log("chains.length", chainIds.length);
         for (uint256 i = 0; i < chainIds.length; i++) {
-            assertEq(chainIds[i], i);
-            console.log("Chain ID:", chainIds[i]);
+            console.log("i:", i);
+            chainweb.switchChain(chainIds[i]);
+            uint256 activeChainId = chainweb.getActiveChainId();
+            assertEq(activeChainId, chainIds[i]);
+            console.log("Active chain ID:", activeChainId);
+        }
+    }
+
+    function test_deployChainWebChainIdContract() public {
+        uint256[] memory chainIds = chainweb.getChainIds();
+        uint256 chainId = chainIds[0];
+        chainweb.switchChain(chainId);
+
+        // Confirm initial value
+        uint256 activeChainId = chainweb.getActiveChainId();
+        assertEq(activeChainId, chainId);
+
+        // Now deploy a new chainweb chain id contract with a different value
+        //uint256 newChainId = 9999;
+        chainweb.deployChainWebChainIdContract(chainId);
+
+        // Check that code exists at the precompile address
+        address precompile = chainweb.CHAIN_ID_PRECOMPILE();
+        uint256 codeSize;
+        assembly {
+            codeSize := extcodesize(precompile)
         }
+        assertGt(codeSize, 0, "No code at CHAIN_ID_PRECOMPILE");
+
+        // Use vm.load to read storage slot 0
+        bytes32 stored;
+        stored = vm.load(precompile, bytes32(uint256(0)));
+        assertEq(uint256(stored), chainId, "Storage slot 0 does not match chainId");
     }
+}
 
+contract ChainwebPluginTest is ChainwebTest(2, 0) {
     function test_nonce() public {
         address deployer = vm.createWallet("deployer").addr;
         uint256 nonce = vm.getNonce(deployer);