fix: relative imports for libs to avoid conflicts

remappings.txt is causing issues when the same library is included in the base project as well as a lib dependency. Use relative imports for maximum compatibility
joejordan · Dec 23, 2022 · 2b74c6c · 2b74c6c
1 parent cab09d3
commit 2b74c6c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/FFICast.sol b/src/FFICast.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.4;
 
 import { PRBTest } from "@prb/test/PRBTest.sol";
 
-import { BytesLib } from "solidity-bytes-utils/BytesLib.sol";
-import { CramBit } from "crambit/CramBit.sol";
+import { BytesLib } from "../lib/solidity-bytes-utils/contracts/BytesLib.sol";
+import { CramBit } from "../lib/CramBit/src/CramBit.sol";
 
 /**
  * @title FFICast

diff --git a/src/FoundryRandom.sol b/src/FoundryRandom.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.4;
 
-import { BytesLib } from "solidity-bytes-utils/BytesLib.sol";
-import { CramBit } from "crambit/CramBit.sol";
+import { BytesLib } from "../lib/solidity-bytes-utils/contracts/BytesLib.sol";
+import { CramBit } from "../lib/CramBit/src/CramBit.sol";
 
-import { FFICast } from "src/FFICast.sol";
+import { FFICast } from "./FFICast.sol";
 
 /**
  * @title FoundryRandom

diff --git a/test/FFICast.t.sol b/test/FFICast.t.sol
@@ -5,9 +5,9 @@ import { console2 } from "forge-std/console2.sol";
 import { PRBTest } from "@prb/test/PRBTest.sol";
 
 import { BytesLib } from "solidity-bytes-utils/BytesLib.sol";
-import { CramBit } from "crambit/CramBit.sol";
+import { CramBit } from "../lib/CramBit/src/CramBit.sol";
 
-import { FFICast } from "src/FFICast.sol";
+import { FFICast } from "../src/FFICast.sol";
 
 /// @notice basic functionality test of our FFICast project
 contract FFICastTest is PRBTest {

diff --git a/test/FoundryRandom.t.sol b/test/FoundryRandom.t.sol
@@ -4,10 +4,10 @@ pragma solidity >=0.8.4;
 import { console2 } from "forge-std/console2.sol";
 import { PRBTest } from "@prb/test/PRBTest.sol";
 
-import { BytesLib } from "solidity-bytes-utils/BytesLib.sol";
-import { CramBit } from "crambit/CramBit.sol";
+import { BytesLib } from "../lib/solidity-bytes-utils/contracts/BytesLib.sol";
+import { CramBit } from "../lib/CramBit/src/CramBit.sol";
 
-import { FoundryRandom } from "src/FoundryRandom.sol";
+import { FoundryRandom } from "../src/FoundryRandom.sol";
 
 /// @notice tests of our Foundry random number generators.
 contract FoundryRandomTest is PRBTest, FoundryRandom {