Merge pull request #2 from dgma/fix/imports

adjust imports
dgma · Mar 9, 2024 · 67947df · 67947df
2 parents bf6ac95 + 3aec4b3
commit 67947df
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.2",
   "description": "Contracts for dutch reverse auction implementation",
   "files": [
-    "src"
+    "src/*"
   ],
   "keywords": [
     "ethereum",

diff --git a/src/OpenRDA.sol b/src/OpenRDA.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {RDA, Bid, Auction} from "src/RDA.sol";
+import {SafeERC20} from "node_modules/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "node_modules/@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {RDA, Bid, Auction} from "./RDA.sol";
 
 interface RDAEvents {
     event AuctionBegins(bytes32 indexed id, uint256 indexed initBlock);

diff --git a/src/RDA.sol b/src/RDA.sol
@@ -1,15 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {Math} from "node_modules/@openzeppelin/contracts/utils/math/Math.sol";
+import {OwnableUpgradeable} from
+    "node_modules/@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {EnumerableSet} from "node_modules/@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import {RDAMathLib} from "src/RDAMathLib.sol";
+import {RDAMathLib} from "./RDAMathLib.sol";
 
-import {IRDA, Auction, ActiveAuctionReport, Bid, ActiveAuctionHouse} from "src/RDA.types.sol";
+import {IRDA, Auction, ActiveAuctionReport, Bid, ActiveAuctionHouse} from "./RDA.types.sol";
 
-import {RDABase} from "src/RDABase.sol";
+import {RDABase} from "./RDABase.sol";
 
 abstract contract RDA is IRDA, OwnableUpgradeable, RDABase {
     using Math for uint256;

diff --git a/src/RDABase.sol b/src/RDABase.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
-import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {Math} from "node_modules/@openzeppelin/contracts/utils/math/Math.sol";
+import {EnumerableSet} from "node_modules/@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import {RDAMathLib} from "src/RDAMathLib.sol";
+import {RDAMathLib} from "./RDAMathLib.sol";
 
 import {
     IRDAMeta,