large refactor to split out domains and bridges and move into library…

… structure
marsfoundation · May 24, 2024 · 1d966d5 · 1d966d5
1 parent 2ece5a4
commit 1d966d5
Show file tree

Hide file tree

Showing 16 changed files with 303 additions and 619 deletions.
diff --git a/src/testing/bridges/BridgeData.sol → src/testing/Bridge.sol b/src/testing/bridges/BridgeData.sol → src/testing/Bridge.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import { Domain } from "src/testing/Domain.sol";
+import { Domain } from "./Domain.sol";
 
-struct BridgeData {
+struct Bridge {
     Domain  source;
     Domain  destination;
     address sourceCrossChainMessenger;

diff --git a/src/testing/BridgedDomain.sol b/src/testing/BridgedDomain.sol
diff --git a/src/testing/CircleCCTPDomain.sol b/src/testing/CircleCCTPDomain.sol
diff --git a/src/testing/Domain.sol b/src/testing/Domain.sol
@@ -16,7 +16,7 @@ library DomainHelpers {
     function createFork(StdChains.Chain memory chain, uint256 blockNumber) internal returns (Domain memory domain) {
         domain = Domain({
             chain:  chain,
-            forkId: vm.createFork(chain.rpcUrl, blockNum)
+            forkId: vm.createFork(chain.rpcUrl, blockNumber)
         });
     }
 
@@ -30,7 +30,7 @@ library DomainHelpers {
     function createSelectFork(StdChains.Chain memory chain, uint256 blockNumber) internal returns (Domain memory domain) {
         domain = Domain({
             chain:  chain,
-            forkId: vm.createSelectFork(chain.rpcUrl, blockNum)
+            forkId: vm.createSelectFork(chain.rpcUrl, blockNumber)
         });
         _assertExpectedRpc(chain);
     }
@@ -45,14 +45,14 @@ library DomainHelpers {
 
     function selectFork(Domain memory domain) internal {
         vm.selectFork(domain.forkId);
-        _assertExpectedRpc(domain);
+        _assertExpectedRpc(domain.chain);
     }
 
     function rollFork(Domain memory domain, uint256 blockNumber) internal {
         vm.rollFork(domain.forkId, blockNumber);
     }
 
-    function _assertExpectedRpc(StdChains.Chain memory chain) private {
+    function _assertExpectedRpc(StdChains.Chain memory chain) private view {
         require(block.chainid == chain.chainId, string(abi.encodePacked(chain.chainAlias, " is pointing to the wrong RPC endpoint '", chain.rpcUrl, "'")));
     }
 

diff --git a/src/testing/GnosisDomain.sol b/src/testing/GnosisDomain.sol