removed openzeppelin upgradeable

Transient-Labs · Dec 26, 2023 · 3099f42 · 3099f42
1 parent bb12dbf
commit 3099f42
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/openzeppelin-contracts-upgradeable"]
-	path = lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
diff --git a/Makefile b/Makefile
@@ -14,7 +14,6 @@ remove:
 install:
 	forge install foundry-rs/forge-std --no-commit
 	forge install OpenZeppelin/[email protected] --no-commit
-	forge install OpenZeppelin/[email protected] --no-commit
 
 # Update the modules
 update: remove install

diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/remappings.txt b/remappings.txt
@@ -0,0 +1,5 @@
+ds-test/=lib/forge-std/lib/ds-test/src/
+erc4626-tests/=lib/openzeppelin-contracts-upgradeable/lib/erc4626-tests/
+forge-std/=lib/forge-std/src/
+openzeppelin/=lib/openzeppelin-contracts/contracts/
+@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
diff --git a/src/example/Example721.sol b/src/example/Example721.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {ERC721} from "lib/openzeppelin-contracts/contracts/token/ERC721/ERC721.sol";
-import {Ownable} from "lib/openzeppelin-contracts/contracts/access/Ownable.sol";
+import {ERC721} from "openzeppelin/token/ERC721/ERC721.sol";
+import {Ownable} from "openzeppelin/access/Ownable.sol";
 import {IStory} from "src/IStory.sol";
 
 contract Example721 is ERC721, Ownable, IStory {