one contract per file, files match contract names (#75)

* one contract per file, files match contract names * snapshot
init4tech · Aug 5, 2024 · 914146a · 914146a
1 parent 8a1a543
commit 914146a
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 12 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -1,8 +1,8 @@
 GnosisSafeTest:test_gnosis_receive() (gas: 15927)
 OrderOriginPermit2Test:test_fillPermit2() (gas: 223464)
-OrderOriginPermit2Test:test_fillPermit2_multi() (gas: 1010764)
+OrderOriginPermit2Test:test_fillPermit2_multi() (gas: 1007964)
 OrderOriginPermit2Test:test_initiatePermit2() (gas: 233946)
-OrderOriginPermit2Test:test_initiatePermit2_multi() (gas: 984506)
+OrderOriginPermit2Test:test_initiatePermit2_multi() (gas: 981706)
 OrdersTest:test_fill_ERC20() (gas: 71459)
 OrdersTest:test_fill_ETH() (gas: 69090)
 OrdersTest:test_fill_both() (gas: 167814)

diff --git a/script/Zenith.s.sol b/script/Zenith.s.sol
@@ -3,8 +3,9 @@ pragma solidity 0.8.26;
 
 // deploy contracts
 import {Zenith} from "../src/Zenith.sol";
-import {Transactor} from "../src/Transact.sol";
-import {HostOrders, RollupOrders} from "../src/orders/Orders.sol";
+import {Transactor} from "../src/Transactor.sol";
+import {HostOrders} from "../src/orders/HostOrders.sol";
+import {RollupOrders} from "../src/orders/RollupOrders.sol";
 import {Passage} from "../src/passage/Passage.sol";
 import {RollupPassage} from "../src/passage/RollupPassage.sol";
 // utils

diff --git a/src/Transact.sol → src/Transactor.sol b/src/Transact.sol → src/Transactor.sol
diff --git a/src/orders/HostOrders.sol b/src/orders/HostOrders.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity 0.8.26;
+
+import {OrderDestination} from "./OrderDestination.sol";
+import {UsesPermit2} from "../UsesPermit2.sol";
+
+contract HostOrders is OrderDestination {
+    constructor(address _permit2) UsesPermit2(_permit2) {}
+}
diff --git a/src/orders/Orders.sol → src/orders/RollupOrders.sol b/src/orders/Orders.sol → src/orders/RollupOrders.sol
@@ -5,10 +5,6 @@ import {OrderDestination} from "./OrderDestination.sol";
 import {OrderOrigin} from "./OrderOrigin.sol";
 import {UsesPermit2} from "../UsesPermit2.sol";
 
-contract HostOrders is OrderDestination {
-    constructor(address _permit2) UsesPermit2(_permit2) {}
-}
-
 contract RollupOrders is OrderOrigin, OrderDestination {
     constructor(address _permit2) UsesPermit2(_permit2) {}
 }
diff --git a/test/Orders.t.sol b/test/Orders.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.26;
 
 // test contracts
 import {IOrders} from "../src/orders/IOrders.sol";
-import {RollupOrders} from "../src/orders/Orders.sol";
+import {RollupOrders} from "../src/orders/RollupOrders.sol";
 import {OrderOrigin} from "../src/orders/OrderOrigin.sol";
 // utils
 import {TestERC20} from "./Helpers.t.sol";

diff --git a/test/Permit2Orders.t.sol b/test/Permit2Orders.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.26;
 
 // test contracts
-import {RollupOrders} from "../src/orders/Orders.sol";
+import {RollupOrders} from "../src/orders/RollupOrders.sol";
 import {IOrders} from "../src/orders/IOrders.sol";
 import {UsesPermit2} from "../src/UsesPermit2.sol";
 // utils

diff --git a/test/Permit2Passage.t.sol b/test/Permit2Passage.t.sol
@@ -130,7 +130,7 @@ contract RollupPassagePermit2Test is SharedPermit2Test {
         _setUpPermit2(token, amount);
         _setupSinglePermit(token, amount);
 
-        // deploy Passage
+        // deploy RollupPassage
         target = new RollupPassage(address(permit2Contract));
         vm.label(address(target), "passage");
 

diff --git a/test/Transact.t.sol → test/Transactor.t.sol b/test/Transact.t.sol → test/Transactor.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.26;
 
 // test contracts
-import {Transactor} from "../src/Transact.sol";
+import {Transactor} from "../src/Transactor.sol";
 import {Passage} from "../src/passage/Passage.sol";
 // utils
 import {Test, console2} from "forge-std/Test.sol";