♻️ Refactor From-Parent-Directory Imports (#194)

Signed-off-by: Pascal Marco Caversaccio <[email protected]>
pcaversaccio · Jan 13, 2024 · f716a5c · f716a5c
1 parent e4f19d1
commit f716a5c
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 131 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
diff --git a/lib/create-util b/lib/create-util
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/solady b/lib/solady
diff --git a/package.json b/package.json
@@ -39,10 +39,10 @@
     "@openzeppelin/merkle-tree": "^1.0.5",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
-    "ethers": "^6.9.2",
+    "ethers": "^6.10.0",
     "keccak256": "^1.0.6",
     "merkletreejs": "^0.3.11",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.1",
     "prettier-plugin-solidity": "^1.3.1",
     "solhint": "^4.1.1"
   }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/extensions/ERC4626.vy b/src/extensions/ERC4626.vy
@@ -65,7 +65,7 @@ implements: ERC20Detailed
 # @dev We import and implement the `IERC20Permit`
 # interface, which is written using standard Vyper
 # syntax.
-from ..tokens.interfaces.IERC20Permit import IERC20Permit
+from ..tokens.interfaces import IERC20Permit
 implements: IERC20Permit
 
 
@@ -77,7 +77,7 @@ implements: ERC4626
 
 # @dev We import and implement the `IERC5267` interface,
 # which is written using standard Vyper syntax.
-from ..utils.interfaces.IERC5267 import IERC5267
+from ..utils.interfaces import IERC5267
 implements: IERC5267
 
 

diff --git a/src/tokens/ERC20.vy b/src/tokens/ERC20.vy
@@ -72,7 +72,7 @@ implements: IERC20Permit
 
 # @dev We import and implement the `IERC5267` interface,
 # which is written using standard Vyper syntax.
-from ..utils.interfaces.IERC5267 import IERC5267
+from ..utils.interfaces import IERC5267
 implements: IERC5267
 
 

diff --git a/src/tokens/ERC721.vy b/src/tokens/ERC721.vy
@@ -87,7 +87,7 @@ implements: IERC4906
 
 # @dev We import and implement the `IERC5267` interface,
 # which is written using standard Vyper syntax.
-from ..utils.interfaces.IERC5267 import IERC5267
+from ..utils.interfaces import IERC5267
 implements: IERC5267
+3 −0		.github/workflows/checks.yml
+10 −22		hardhat.config.js
+0 −18		hardhat/env-contract.js
+17 −528		package-lock.json
+0 −1		package.json
+1 −1		test/governance/Governor.test.js
+1 −10		test/sanity.test.js
+1 −1		test/token/ERC1155/ERC1155.behavior.js
+1 −1		test/token/ERC1155/utils/ERC1155Holder.test.js
+1 −1		test/token/ERC721/ERC721.behavior.js
+1 −1		test/utils/introspection/ERC165.test.js
+3 −1		test/utils/introspection/SupportsInterface.behavior.js
+133 −130		.gas-snapshot
+1 −1		package.json
+27 −20		src/utils/Initializable.sol
+3 −3		src/utils/JSONParserLib.sol
+1 −1		src/utils/LibString.sol
+29 −1		test/JSONParserLib.t.sol