Hardhat: remove symlink usage for deps. Fix HH408. (#589)

Co-authored-by: Karim <[email protected]>
Near-One · Feb 3, 2022 · 1620a71 · 1620a71
1 parent 45cb81d
commit 1620a71
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.buildkite/contracts-eth.yml b/.buildkite/contracts-eth.yml
@@ -12,6 +12,7 @@ steps:
       command: |
           source testing/ci/e2e_ci_prepare_env.sh
           cd contracts/eth/nearprover
+          yarn --cwd ../
           yarn
           yarn test
       agents:

diff --git a/.github/workflows/contracts-eth.yml b/.github/workflows/contracts-eth.yml
@@ -21,6 +21,7 @@ jobs:
           - job-name: nearprover test
             cmd: |
               cd contracts/eth/nearprover
+              yarn --cwd ../
               yarn
               yarn test
             timeout-minutes: 40

diff --git a/contracts/eth/nearprover/contracts/NearBridgeMock.sol b/contracts/eth/nearprover/contracts/NearBridgeMock.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8;
 
-import "./bridge/INearBridge.sol";
+import "rainbow-bridge-sol/nearbridge/contracts/INearBridge.sol";
 
 contract NearBridgeMock is INearBridge {
     mapping(uint64 => bytes32) public override blockHashes;

diff --git a/contracts/eth/nearprover/contracts/NearProver.sol b/contracts/eth/nearprover/contracts/NearProver.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8;
 
-import "./bridge/AdminControlled.sol";
-import "./bridge/INearBridge.sol";
-import "./bridge/NearDecoder.sol";
+import "rainbow-bridge-sol/nearbridge/contracts/AdminControlled.sol";
+import "rainbow-bridge-sol/nearbridge/contracts/INearBridge.sol";
+import "rainbow-bridge-sol/nearbridge/contracts/NearDecoder.sol";
 import "./ProofDecoder.sol";
 import "./INearProver.sol";
 

diff --git a/contracts/eth/nearprover/contracts/ProofDecoder.sol b/contracts/eth/nearprover/contracts/ProofDecoder.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8;
 
-import "./bridge/Borsh.sol";
-import "./bridge/NearDecoder.sol";
+import "rainbow-bridge-sol/nearbridge/contracts/Borsh.sol";
+import "rainbow-bridge-sol/nearbridge/contracts/NearDecoder.sol";
 
 library ProofDecoder {
     using Borsh for Borsh.Data;