added @openzeppelin/contracts as peer-deps & adjusted tests

pcaversaccio · Nov 5, 2021 · 4ce2ae4 · 4ce2ae4
1 parent a1a5138
commit 4ce2ae4
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 898 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This plugin will help you make easier and safer usage of the [`CREATE2`](https:/
 
 ## Installation
 ```bash
-npm install --save-dev xdeployer @nomiclabs/hardhat-ethers
+npm install --save-dev xdeployer @nomiclabs/hardhat-ethers @openzeppelin/contracts
 ```
 > **Note:** This plugin uses the optional chaining operator (`?.`). Optional chaining is _not_ supported in Node.js v13 and below.
 

diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
   },
   "peerDependencies": {
     "hardhat": "^2.0.0",
-    "@nomiclabs/hardhat-ethers": "^2.0.2"
+    "@nomiclabs/hardhat-ethers": "^2.0.2",
+    "@openzeppelin/contracts": "^4.3.2"
   }
 }
diff --git a/test/fixture-projects/hardhat-project-with-constructor/contracts/Create2Deployer.sol b/test/fixture-projects/hardhat-project-with-constructor/contracts/Create2Deployer.sol
@@ -3,10 +3,10 @@
 
 pragma solidity ^0.8.4;
 
-import "./imported/Create2.sol";
-import "./imported/ERC1820Implementer.sol";
-import "./imported/Ownable.sol";
-import "./imported/Pausable.sol";
+import "@openzeppelin/contracts/utils/Create2.sol";
+import "@openzeppelin/contracts/utils/introspection/ERC1820Implementer.sol";
+import "@openzeppelin/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts/security/Pausable.sol";
 
 
 /**

diff --git a/test/fixture-projects/hardhat-project-with-constructor/contracts/imported/Create2.sol b/test/fixture-projects/hardhat-project-with-constructor/contracts/imported/Create2.sol
diff --git a/...xture-projects/hardhat-project-with-constructor/contracts/imported/ERC1820Implementer.sol b/...xture-projects/hardhat-project-with-constructor/contracts/imported/ERC1820Implementer.sol
diff --git a/...ture-projects/hardhat-project-with-constructor/contracts/imported/IERC1820Implementer.sol b/...ture-projects/hardhat-project-with-constructor/contracts/imported/IERC1820Implementer.sol
diff --git a/test/fixture-projects/hardhat-project-with-constructor/contracts/imported/Ownable.sol b/test/fixture-projects/hardhat-project-with-constructor/contracts/imported/Ownable.sol
diff --git a/test/fixture-projects/hardhat-project-with-constructor/contracts/imported/Pausable.sol b/test/fixture-projects/hardhat-project-with-constructor/contracts/imported/Pausable.sol
diff --git a/test/fixture-projects/hardhat-project-without-constructor/contracts/Create2Deployer.sol b/test/fixture-projects/hardhat-project-without-constructor/contracts/Create2Deployer.sol
@@ -3,10 +3,10 @@
 
 pragma solidity ^0.8.4;
 
-import "./imported/Create2.sol";
-import "./imported/ERC1820Implementer.sol";
-import "./imported/Ownable.sol";
-import "./imported/Pausable.sol";
+import "@openzeppelin/contracts/utils/Create2.sol";
+import "@openzeppelin/contracts/utils/introspection/ERC1820Implementer.sol";
+import "@openzeppelin/contracts/access/Ownable.sol";
+import "@openzeppelin/contracts/security/Pausable.sol";
 
 
 /**

diff --git a/test/fixture-projects/hardhat-project-without-constructor/contracts/imported/Context.sol b/test/fixture-projects/hardhat-project-without-constructor/contracts/imported/Context.sol