Experiment: revert implicit imports (#223)

Axis-Fi · Jul 16, 2024 · d07b331 · d07b331
1 parent 623ca2e
commit d07b331
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 31 deletions.
diff --git a/script/salts/salts.json b/script/salts/salts.json
@@ -18,23 +18,23 @@
     "0xf7e1693ed561ec566275117c8ea944263f9f801df4d4c61e4a934b7152f36dcc": "0x0b3e7731b05ed1f6d2cbbc4e64b503b8582801ae807ee756b3472916ec29c6fb"
   },
   "Test_MockCallback": {
-    "0x04f04a7cb2f68be3ab1f0e9212ded732863fdb5f632fa1314c57a7e55ceecdcf": "0x7c1a352c790df935ee54d1f7eb415402af8afc0daf3220d947371e9a551adaa5",
-    "0x24c1176362f36311e65d5e6f9b336fc633414507a635f19624e1a197f9d2ef18": "0x82b74e410fd23c31d6406e8faf3d368ec4f469fd293a2f3476170039deef1631",
-    "0x490726f95b5bab1774c83979024a41fef17eb22b5ee96a326b27c319ea3cf3f2": "0xf7d9127a8714b2987afe2298d36086bb8c6421a4f4399401b393856161578196",
-    "0x6f097ff65b93848ccc61cb21a52e08649581fae7a62f72eac43966203fa1b7a8": "0x4958d22b78e1244079c1f08498f3f333dce325addb4cc8804b91521358fc19b5",
-    "0x6f7abfe7424c0f09c0d3357af3fa10dcb5fd3c5ff9e27b6ddac8e6710a802f72": "0xbdd6cdc701742a1c8b2d999ae7c2c2007d2b0536620ef7b6ff030869a52fc2c8",
-    "0x7090c3c3983fd8549ecc261793182cc43c54c6bccdf9b653a21d7373fcf0d167": "0x5e81390b1263e0b6c541af52f3a2afc6ee80393d5f96e34e0fc20c1634172d97",
-    "0x7341cb58fa1311c25a4511d5a65f1d32cf68582c4afd5c5c1a6771958b721867": "0x28a94cabb24bdaf66e52e06e1145cda07b8c32c209536bcffaf66dac895d6bbd",
-    "0x76fe472c8d1739e2122edbf5098d17844722d5da669203b66122efec7426e4c9": "0x5d52b5c2ca2061eb2fea727f06be2508a3a82903f6ea786cce85b86347ed23d0",
-    "0x78a3c527c07a862ac8858b0e131c951301d7895983b8566e62f8e8d0fd58120e": "0x802efa1f97342d5edeff8ef7674e152c118daa711609155cfca76f05bc4b7018",
-    "0x79e78404087bc05baaef3df3f69a92ec95356dba351dde4b728b55cde153f862": "0x374fd56a47eec7e10725fdab7e6bbf81cc7d424822e6d5661b7f8e763855fb49",
-    "0x8b3408ba635e2834050fe3539070470b1b71b105a5cf264dfe6d3a69a85ec5e5": "0xc108f05de029f258ca1697a5cb533a3e3d7d7e30622bded0e57b4bf11ce4de2f",
-    "0x8c1d08938fe42021134aa7f9261f2a993839d63910e9befeb90c4a297ab0adf6": "0x88c26740854cbabadcd95d902e8abd1ed091a67be7a0c8b2edef0a96570653ba",
-    "0x8f24ba38030a36251b0b42de23be3efc37fc9cac4446b9b77412a5151928ffde": "0x86eac9b5b999f4e98992402ad7b7efc310d627286237d182fab94e48ed8e02fb",
-    "0x9d9b418dba9db0dc1121cb31d4010d87ed2c3ff01e9ff3a09134708ad10e621c": "0x2d6fcc63c1630ba7156efa08d14e19f3e15495af5fce7245d0f2df75b75bd68b",
-    "0xbfdb46d3ce1ef77e0a29aed82f4bab2184cb211d631f301c45a1796c8447c2c3": "0x8558a0ec91b1286c145ace2ecb23a6568cc8194c67f41018240eaf22a0c4cccd",
-    "0xc91c111e864163a6f4b0ad3f42821d435bc7e3a0862b0558746af53c33d0e676": "0x231c5de767aaaf9a5e770eaaa26828b8095fa41d1bbf3a4d77aee569f790e7c7",
-    "0xf041ca8dd5ebacdfa72764e84f118c50b30374e9cf29482f0d83be1f2a1527b8": "0x1b5477810e8fd4d25469abb32c0ca06edf634b613f68facdef52dd84160e89f3",
-    "0xf3ede40da9293584921370afe2ac848c2ff54d10ded9bb6611c380a82421fe63": "0x32f9ec151ac97641329a5f57dafed3d9f9febde9eb69cd3491aee7f65dfa0116"
+    "0x058a683a9b89d8fef11f948a9ff743fb5088652c0e25b96d3ae6672ffd7ad46e": "0x8d5cea20e435a43655e1ee443edec8ae5c1f779b3b3ec376b1585ea5448a5239",
+    "0x118c419f6ceb38288ecf1a9dc519cab46609ce6c21a5289f27368260aff8fe3c": "0xdacc69039ea609627b4012e42452db1b52aa1a5b2723ca399c427e97cd23eaf7",
+    "0x1f52d3b12a9c3d3729b4afb9d26b3cb16003e6a535aae9d66162ef7debbe2673": "0xd411f70ed5aa31cab967a781c08dfbe664f88b650d0e6c4777cb4238302136a2",
+    "0x372657172e4ed2bfd69331fe4ec2d669938fb7995a22f2c1e810190eb6e24506": "0x0b3d1231c5791d5be137de880a7b5e4a194aaa5d3f174dbdc37fd8a845303f9c",
+    "0x3ddbd73d203bf2c86fe71549787579afd698153839feb32a3a785a63e13bdd12": "0xae425d8c353a4ee67545b7cc0cb8be8ad1ac5ab7723b15f9e315810db785ec70",
+    "0x49e8420a835213c2a8ab541675c6c8308f8f6e0748d53cb3d0cd37312a1322e6": "0x7b113102b1b65f84df896d100644496610d45ba27196d53d901f0665cde9a06b",
+    "0x4d4825a9aa171850ca3b146e93452aa2d855dc843a82c4f4939cf3b44b84c5c1": "0x343e322484e55122720ca77439e3f9b703acc51c76ec770b7fd06698f67f2e6b",
+    "0x51591efc4b0e64465a7e74bd5bbe37afd19e1a7c2f1f61a6f7df756a68277f5c": "0xd57ae5d6f75fceaae3fecff86dd28dc29e354764db352e2fc2351fb7214a4515",
+    "0x57e3af0b13629069edf19ed36fa262a582bca60a825b5a705c0ffd0bb1aa188e": "0x13fb8c6b9bf54a8780c14ebe775a6ec714f9aeffdb9af36eee0b46faf80b3646",
+    "0x5ad8d72b2d788129fa101adfbcf937fef2688ccb7c6523cfb0fb0d57715c0b8b": "0x889da713105750dbf9971711e76f3878f2a178408d9321a64c8da4b7673e0f7e",
+    "0x64fbbe8721d10f412862db0b94bd1af7e60fed182f6505f7f0bb9c2d978265b8": "0x906d1c4dc0b0f398b675ade245250688684b93e8a0d2867761f3f44e90429fd0",
+    "0x7951b3447d4b391b0ebeb4180c6c72f482d7c4e3ba29034d7601621022bc857f": "0x581a94a01177a65dc13503523f35cc76cb81b47fb2db1404653d1bdf42fcc8a3",
+    "0x995c7b3d6694618282e860be6c1756b11a91247e42b231f83ae4f4b9448a5990": "0xfc514d94c988c5e512a5170e2f08fadc8cee843cfe460893fa13a03a4ce94ac4",
+    "0xab0f257ee8d67875d260eaa995027e28c4e7395e2efc18f88bef2c7904d29454": "0x114e051f93e35f4b972a99d91bc8b0ed486b697f50538ad2093f66eaee4b782d",
+    "0xb99e781e8315fd6399a0bc1794359f6dae8a32a01b0a0a22207991c4253d1e8a": "0x3c6bccfc73401c3be942a012fbd99fab47adbdcb0bc3904cfac2ee02a3696a97",
+    "0xe00ef594f06059d58eb2d0af0725882c392d494c4d53353055dcc79299e6ecaf": "0x10fdf8a0f7bcb76be62fed9f48a0150ad2ab1e65936b45a7711bd5ab49a245a5",
+    "0xec104b1b5ff88091d83f7912d85b3ac52f8ae0741a1125ebaddae1ffbce9e043": "0xf6a442df31373e2199adcc053b4684b0599d8e4eb389f6a09a9c3b43b9d05816",
+    "0xeefe4765e89c77202e55f3b0a7206d13f2e170c5c81265c29b1a6c587385299b": "0xd0c1ab3ce717fb29b40ae6fac171801fc6a2fe75b672d312705d67823d94b037"
   }
 }
diff --git a/src/interfaces/IAtomicAuctionHouse.sol b/src/interfaces/IAtomicAuctionHouse.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import "./IAuctionHouse.sol";
+import {IAuctionHouse} from "./IAuctionHouse.sol";
 
 /// @title      IAtomicAuctionHouse
 /// @notice     An interface to define the AtomicAuctionHouse's buyer-facing functions

diff --git a/src/interfaces/IAtomicCatalogue.sol b/src/interfaces/IAtomicCatalogue.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import "./ICatalogue.sol";
+import {ICatalogue} from "./ICatalogue.sol";
 
 /// @title  IAtomicCatalogue
 /// @notice Interface for the AtomicCatalogue contract, which provides view functions for atomic auctions

diff --git a/src/interfaces/IAuctionHouse.sol b/src/interfaces/IAuctionHouse.sol
@@ -2,12 +2,12 @@
 pragma solidity >=0.8.0;
 
 // Interfaces
-import "./modules/IAuction.sol";
-import "./ICallback.sol";
-import "./modules/IDerivative.sol";
+import {IAuction} from "./modules/IAuction.sol";
+import {ICallback} from "./ICallback.sol";
+import {IDerivative} from "./modules/IDerivative.sol";
 
 // Internal dependencies
-import "../modules/Keycode.sol";
+import {Keycode, Veecode} from "../modules/Keycode.sol";
 
 /// @title  IAuctionHouse
 /// @notice Interface for the Axis AuctionHouse contracts

diff --git a/src/interfaces/IBatchAuctionHouse.sol b/src/interfaces/IBatchAuctionHouse.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import "./IAuctionHouse.sol";
+import {IAuctionHouse} from "./IAuctionHouse.sol";
 
 /// @title      IBatchAuctionHouse
 /// @notice     An interface to define the BatchAuctionHouse's buyer-facing functions

diff --git a/src/interfaces/IBatchCatalogue.sol b/src/interfaces/IBatchCatalogue.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import "./ICatalogue.sol";
-import "./modules/IBatchAuction.sol";
+import {ICatalogue} from "./ICatalogue.sol";
+import {IBatchAuction} from "./modules/IBatchAuction.sol";
 
 /// @title  IBatchCatalogue
 /// @notice Interface for the BatchCatalogue contract, which provides view functions for batch auctions

diff --git a/src/interfaces/ICatalogue.sol b/src/interfaces/ICatalogue.sol
@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import "./IAuctionHouse.sol";
+import {IAuctionHouse} from "./IAuctionHouse.sol";
+
+import {Keycode, Veecode} from "../modules/Keycode.sol";
 
 /// @title      ICatalogue
 /// @notice     Interface for the Catalogue contract, which provides view functions for auctions

diff --git a/src/interfaces/IFeeManager.sol b/src/interfaces/IFeeManager.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import "../modules/Keycode.sol";
+import {Keycode} from "../modules/Keycode.sol";
 
 /// @title      IFeeManager
 /// @notice     Defines the interface to interact with auction fees

diff --git a/src/interfaces/modules/IAtomicAuction.sol b/src/interfaces/modules/IAtomicAuction.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import "./IAuction.sol";
+import {IAuction} from "./IAuction.sol";
 
 /// @title  IAtomicAuction
 /// @notice Interface for atomic auctions

diff --git a/src/interfaces/modules/IBatchAuction.sol b/src/interfaces/modules/IBatchAuction.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity >=0.8.0;
 
-import "./IAuction.sol";
+import {IAuction} from "./IAuction.sol";
 
 /// @title  IBatchAuction
 /// @notice Interface for batch auctions