feat(remappings): update remappings to my standard

NFT-XYZ · Aug 17, 2023 · 0443a0d · 0443a0d
1 parent 68bd25f
commit 0443a0d
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 39 deletions.
diff --git a/remappings.txt b/remappings.txt
@@ -1,3 +1,2 @@
-ds-test/=lib/forge-std/lib/ds-test/src/
-forge-std/=lib/forge-std/src/
-@openzeppelin/=lib/openzeppelin-contracts/
+@std/=lib/forge-std/src/
+@oz/=lib/openzeppelin-contracts/contracts/
diff --git a/scripts/NFTIME.s.sol b/scripts/NFTIME.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.18;
 
-import {Script} from "forge-std/Script.sol";
+import {Script} from "@std/Script.sol";
 import {NFTIME} from "../src/NFTIME.sol";
 import {DateTime} from "../src/libraries/DateTime.sol";
 

diff --git a/src/NFTIME.sol b/src/NFTIME.sol
@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";
-import {Counters} from "@openzeppelin/contracts/utils/Counters.sol";
-import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
-import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
-import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
-import {ERC721Pausable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Pausable.sol";
-import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";
-import {Base64} from "@openzeppelin/contracts/utils/Base64.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {Ownable} from "@oz/access/Ownable.sol";
+import {AccessControl} from "@oz/access/AccessControl.sol";
+import {Counters} from "@oz/utils/Counters.sol";
+import {ERC721} from "@oz/token/ERC721/ERC721.sol";
+import {ERC721URIStorage} from "@oz/token/ERC721/extensions/ERC721URIStorage.sol";
+import {ERC721Enumerable} from "@oz/token/ERC721/extensions/ERC721Enumerable.sol";
+import {ERC721Pausable} from "@oz/token/ERC721/extensions/ERC721Pausable.sol";
+import {ERC721Burnable} from "@oz/token/ERC721/extensions/ERC721Burnable.sol";
+import {Base64} from "@oz/utils/Base64.sol";
+import {Strings} from "@oz/utils/Strings.sol";
 
 import {Date, DateTime} from "./libraries/DateTime.sol";
 import {NFTIMEMetadata} from "./libraries/NFTIMEMetadata.sol";

diff --git a/src/V1/NFTIMEV1.sol b/src/V1/NFTIMEV1.sol
@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";
-import {Counters} from "@openzeppelin/contracts/utils/Counters.sol";
-import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
-import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
-import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
-import {ERC721Pausable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Pausable.sol";
-import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";
-import {Base64} from "@openzeppelin/contracts/utils/Base64.sol";
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {Ownable} from "@oz/access/Ownable.sol";
+import {AccessControl} from "@oz/access/AccessControl.sol";
+import {Counters} from "@oz/utils/Counters.sol";
+import {ERC721} from "@oz/token/ERC721/ERC721.sol";
+import {ERC721URIStorage} from "@oz/token/ERC721/extensions/ERC721URIStorage.sol";
+import {ERC721Enumerable} from "@oz/token/ERC721/extensions/ERC721Enumerable.sol";
+import {ERC721Pausable} from "@oz/token/ERC721/extensions/ERC721Pausable.sol";
+import {ERC721Burnable} from "@oz/token/ERC721/extensions/ERC721Burnable.sol";
+import {Base64} from "@oz/utils/Base64.sol";
+import {Strings} from "@oz/utils/Strings.sol";
 
 import {Date, DateTime} from "./utils/DateTime.sol";
 import {Renderer} from "./utils/Renderer.sol";

diff --git a/src/V1/utils/DateTime.sol b/src/V1/utils/DateTime.sol
@@ -4,7 +4,7 @@
 
 pragma solidity ^0.8.18;
 
-import "@openzeppelin/contracts/utils/Strings.sol";
+import "@oz/utils/Strings.sol";
 
 struct Date {
     uint256 year;

diff --git a/src/V2/NFTIMEV2.sol b/src/V2/NFTIMEV2.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";
-import {Counters} from "@openzeppelin/contracts/utils/Counters.sol";
-import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
-import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
-import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
-import {ERC721Pausable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Pausable.sol";
-import {ERC721Burnable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Burnable.sol";
+import {Ownable} from "@oz/access/Ownable.sol";
+import {AccessControl} from "@oz/access/AccessControl.sol";
+import {Counters} from "@oz/utils/Counters.sol";
+import {ERC721} from "@oz/token/ERC721/ERC721.sol";
+import {ERC721URIStorage} from "@oz/token/ERC721/extensions/ERC721URIStorage.sol";
+import {ERC721Enumerable} from "@oz/token/ERC721/extensions/ERC721Enumerable.sol";
+import {ERC721Pausable} from "@oz/token/ERC721/extensions/ERC721Pausable.sol";
+import {ERC721Burnable} from "@oz/token/ERC721/extensions/ERC721Burnable.sol";
 
 import {Date, DateTime} from "./libraries/DateTime.sol";
 

diff --git a/src/V2/libraries/DateTime.sol b/src/V2/libraries/DateTime.sol
@@ -4,7 +4,7 @@
 
 pragma solidity ^0.8.18;
 
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {Strings} from "@oz/utils/Strings.sol";
 
 struct Date {
     uint256 year;

diff --git a/src/libraries/DateTime.sol b/src/libraries/DateTime.sol
@@ -4,7 +4,7 @@
 
 pragma solidity ^0.8.18;
 
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {Strings} from "@oz/utils/Strings.sol";
 
 /// @dev Struct for all necessary Date-Attributes
 struct Date {

diff --git a/src/libraries/NFTIMEArt.sol b/src/libraries/NFTIMEArt.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
+import {Strings} from "@oz/utils/Strings.sol";
 
 import {Date} from "./DateTime.sol";
 

diff --git a/src/libraries/NFTIMEMetadata.sol b/src/libraries/NFTIMEMetadata.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
-import {Base64} from "@openzeppelin/contracts/utils/Base64.sol";
+import {Strings} from "@oz/utils/Strings.sol";
+import {Base64} from "@oz/utils/Base64.sol";
 
 import {NFTIMEArt} from "./NFTIMEArt.sol";
 import {Date, DateTime} from "./DateTime.sol";

diff --git a/tests/NFTIME.t.sol b/tests/NFTIME.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.18;
 
-import {Test} from "forge-std/Test.sol";
+import {Test} from "@std/Test.sol";
 import {NFTIME} from "../src/NFTIME.sol";
 
 import {DateTime, Date} from "../src/libraries/DateTime.sol";