feat: remove remapings (#22)

defi-wonderland · Apr 2, 2024 · 5369801 · 5369801
1 parent fa3221e
commit 5369801
Show file tree

Hide file tree

Showing 34 changed files with 91 additions and 94 deletions.
diff --git a/remappings.txt b/remappings.txt
@@ -1,11 +1,4 @@
 ds-test/=node_modules/ds-test/src
 forge-std/=node_modules/forge-std/src
 isolmate/=node_modules/isolmate/src
-
-@openzeppelin/=node_modules/@openzeppelin/contracts
-
-@contracts/=solidity/contracts
-@interfaces/=solidity/interfaces
-@script/=solidity/script
-@test/=solidity/test
-@utils/=solidity/utils
+openzeppelin/=node_modules/@openzeppelin/contracts
diff --git a/solidity/contracts/core/AutomationVault.sol b/solidity/contracts/core/AutomationVault.sol
@@ -1,10 +1,11 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
-import {IERC20, SafeERC20} from '@openzeppelin/token/ERC20/utils/SafeERC20.sol';
-import {EnumerableSet} from '@openzeppelin/utils/structs/EnumerableSet.sol';
-import {_ALL} from '@utils/Constants.sol';
+import {EnumerableSet} from 'openzeppelin/utils/structs/EnumerableSet.sol';
+import {IERC20, SafeERC20} from 'openzeppelin/token/ERC20/utils/SafeERC20.sol';
+
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
+import {_ALL} from '../../utils/Constants.sol';
 
 /**
  * @title  AutomationVault

diff --git a/solidity/contracts/core/AutomationVaultFactory.sol b/solidity/contracts/core/AutomationVaultFactory.sol
@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IAutomationVaultFactory} from '@interfaces/core/IAutomationVaultFactory.sol';
-import {AutomationVault, IAutomationVault} from '@contracts/core/AutomationVault.sol';
-import {EnumerableSet} from '@openzeppelin/utils/structs/EnumerableSet.sol';
+import {EnumerableSet} from 'openzeppelin/utils/structs/EnumerableSet.sol';
 
+import {IAutomationVaultFactory} from '../../interfaces/core/IAutomationVaultFactory.sol';
+import {AutomationVault, IAutomationVault} from '../core/AutomationVault.sol';
 /**
  * @title  AutomationVaultFactory
  * @notice This contract deploys the new automation vaults
  */
+
 contract AutomationVaultFactory is IAutomationVaultFactory {
   using EnumerableSet for EnumerableSet.AddressSet;
 

diff --git a/solidity/contracts/for-test/BasicJob.sol b/solidity/contracts/for-test/BasicJob.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {IBasicJob} from '@interfaces/for-test/IBasicJob.sol';
+import {IBasicJob} from '../../interfaces/for-test/IBasicJob.sol';
 
 /**
  * @notice This contract is a basic job that can be automated by any automation vault

diff --git a/solidity/contracts/for-test/BasicJobChecker.sol b/solidity/contracts/for-test/BasicJobChecker.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {IGelatoRelay} from '@interfaces/relays/IGelatoRelay.sol';
-import {IBasicJobChecker, IAutomationVault, IBasicJob} from '@interfaces/for-test/IBasicJobChecker.sol';
+import {IGelatoRelay} from '../../interfaces/relays/IGelatoRelay.sol';
+import {IBasicJobChecker, IAutomationVault, IBasicJob} from '../../interfaces/for-test/IBasicJobChecker.sol';
 
 /**
  * @notice This contract is a basic job checker for gelato relay

diff --git a/solidity/contracts/periphery/XKeeperMetadata.sol b/solidity/contracts/periphery/XKeeperMetadata.sol
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IXKeeperMetadata} from '@interfaces/periphery/IXKeeperMetadata.sol';
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
-import {EnumerableSet} from '@openzeppelin/utils/structs/EnumerableSet.sol';
+import {EnumerableSet} from 'openzeppelin/utils/structs/EnumerableSet.sol';
+
+import {IXKeeperMetadata} from '../../interfaces/periphery/IXKeeperMetadata.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
 
 /**
  * @title  XKeeperMetadata

diff --git a/solidity/contracts/relays/GelatoRelay.sol b/solidity/contracts/relays/GelatoRelay.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IAutomate} from '@interfaces/external/IAutomate.sol';
-import {IGelato} from '@interfaces/external/IGelato.sol';
-import {IGelatoRelay, IAutomationVault} from '@interfaces/relays/IGelatoRelay.sol';
+import {IAutomate} from '../../interfaces/external/IAutomate.sol';
+import {IGelato} from '../../interfaces/external/IGelato.sol';
+import {IGelatoRelay, IAutomationVault} from '../../interfaces/relays/IGelatoRelay.sol';
 
 /**
  * @title  GelatoRelay

diff --git a/solidity/contracts/relays/Keep3rBondedRelay.sol b/solidity/contracts/relays/Keep3rBondedRelay.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IKeep3rBondedRelay, IAutomationVault, IKeep3rRelay} from '@interfaces/relays/IKeep3rBondedRelay.sol';
-import {IKeep3rV2} from '@interfaces/relays/IKeep3rRelay.sol';
+import {IKeep3rBondedRelay, IAutomationVault, IKeep3rRelay} from '../../interfaces/relays/IKeep3rBondedRelay.sol';
+import {IKeep3rV2} from '../../interfaces/relays/IKeep3rRelay.sol';
 
 /**
  * @title  Keep3rBondedRelay

diff --git a/solidity/contracts/relays/Keep3rRelay.sol b/solidity/contracts/relays/Keep3rRelay.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IKeep3rRelay, IAutomationVault} from '@interfaces/relays/IKeep3rRelay.sol';
-import {IKeep3rV2} from '@interfaces/external/IKeep3rV2.sol';
+import {IKeep3rRelay, IAutomationVault} from '../../interfaces/relays/IKeep3rRelay.sol';
+import {IKeep3rV2} from '../../interfaces/external/IKeep3rV2.sol';
 
 /**
  * @title  Keep3rRelay

diff --git a/solidity/contracts/relays/OpenRelay.sol b/solidity/contracts/relays/OpenRelay.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IOpenRelay} from '@interfaces/relays/IOpenRelay.sol';
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
-import {_NATIVE_TOKEN} from '@utils/Constants.sol';
+import {IOpenRelay} from '../../interfaces/relays/IOpenRelay.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
+import {_NATIVE_TOKEN} from '../../utils/Constants.sol';
 
 /**
  * @title  OpenRelay

diff --git a/solidity/interfaces/core/IAutomationVaultFactory.sol b/solidity/interfaces/core/IAutomationVaultFactory.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
 
 interface IAutomationVaultFactory {
   /*///////////////////////////////////////////////////////////////

diff --git a/solidity/interfaces/external/IAutomate.sol b/solidity/interfaces/external/IAutomate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {ITaskTreasuryUpgradable} from '@interfaces/external/ITaskTreasuryUpgradable.sol';
+import {ITaskTreasuryUpgradable} from '../../interfaces/external/ITaskTreasuryUpgradable.sol';
 
 // solhint-disable max-line-length
 library LibDataTypes {

diff --git a/solidity/interfaces/external/IKeep3rV1.sol b/solidity/interfaces/external/IKeep3rV1.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.4 <0.9.0;
 
-import {IERC20Metadata} from '@openzeppelin/token/ERC20/extensions/IERC20Metadata.sol';
+import {IERC20Metadata} from 'openzeppelin/token/ERC20/extensions/IERC20Metadata.sol';
 
 interface IKeep3rV1 is IERC20Metadata {}
diff --git a/solidity/interfaces/for-test/IBasicJobChecker.sol b/solidity/interfaces/for-test/IBasicJobChecker.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
-import {IBasicJob} from '@interfaces/for-test/IBasicJob.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
+import {IBasicJob} from '../../interfaces/for-test/IBasicJob.sol';
 
 interface IBasicJobChecker {
   /*///////////////////////////////////////////////////////////////

diff --git a/solidity/interfaces/periphery/IXKeeperMetadata.sol b/solidity/interfaces/periphery/IXKeeperMetadata.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
 
 interface IXKeeperMetadata {
   /*///////////////////////////////////////////////////////////////

diff --git a/solidity/interfaces/relays/IGelatoRelay.sol b/solidity/interfaces/relays/IGelatoRelay.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IAutomate} from '@interfaces/external/IAutomate.sol';
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
+import {IAutomate} from '../../interfaces/external/IAutomate.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
 
 interface IGelatoRelay {
   /*///////////////////////////////////////////////////////////////

diff --git a/solidity/interfaces/relays/IKeep3rBondedRelay.sol b/solidity/interfaces/relays/IKeep3rBondedRelay.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
-import {IKeep3rRelay} from '@interfaces/relays/IKeep3rRelay.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
+import {IKeep3rRelay} from '../../interfaces/relays/IKeep3rRelay.sol';
 
 interface IKeep3rBondedRelay is IKeep3rRelay {
   /*///////////////////////////////////////////////////////////////

diff --git a/solidity/interfaces/relays/IKeep3rRelay.sol b/solidity/interfaces/relays/IKeep3rRelay.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
-import {IKeep3rV2} from '@interfaces/external/IKeep3rV2.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
+import {IKeep3rV2} from '../../interfaces/external/IKeep3rV2.sol';
 
 interface IKeep3rRelay {
   /*///////////////////////////////////////////////////////////////

diff --git a/solidity/interfaces/relays/IOpenRelay.sol b/solidity/interfaces/relays/IOpenRelay.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.19;
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
 
 interface IOpenRelay {
   /*///////////////////////////////////////////////////////////////

diff --git a/solidity/script/Deploy.s.sol b/solidity/script/Deploy.s.sol
@@ -3,16 +3,16 @@ pragma solidity 0.8.19;
 
 import {Script} from 'forge-std/Script.sol';
 
-import {AutomationVaultFactory, IAutomationVaultFactory} from '@contracts/core/AutomationVaultFactory.sol';
-import {IAutomationVault} from '@contracts/core/AutomationVault.sol';
-import {OpenRelay, IOpenRelay} from '@contracts/relays/OpenRelay.sol';
-import {GelatoRelay, IGelatoRelay} from '@contracts/relays/GelatoRelay.sol';
-import {Keep3rRelay, IKeep3rRelay} from '@contracts/relays/Keep3rRelay.sol';
-import {Keep3rBondedRelay, IKeep3rBondedRelay} from '@contracts/relays/Keep3rBondedRelay.sol';
-import {XKeeperMetadata, IXKeeperMetadata} from '@contracts/periphery/XKeeperMetadata.sol';
-import {_NATIVE_TOKEN} from '@utils/Constants.sol';
-import {IAutomate} from '@interfaces/external/IAutomate.sol';
-import {IKeep3rV2} from '@interfaces/external/IKeep3rV2.sol';
+import {AutomationVaultFactory, IAutomationVaultFactory} from '../contracts/core/AutomationVaultFactory.sol';
+import {IAutomationVault} from '../contracts/core/AutomationVault.sol';
+import {OpenRelay, IOpenRelay} from '../contracts/relays/OpenRelay.sol';
+import {GelatoRelay, IGelatoRelay} from '../contracts/relays/GelatoRelay.sol';
+import {Keep3rRelay, IKeep3rRelay} from '../contracts/relays/Keep3rRelay.sol';
+import {Keep3rBondedRelay, IKeep3rBondedRelay} from '../contracts/relays/Keep3rBondedRelay.sol';
+import {XKeeperMetadata, IXKeeperMetadata} from '../contracts/periphery/XKeeperMetadata.sol';
+import {_NATIVE_TOKEN} from '../utils/Constants.sol';
+import {IAutomate} from '../interfaces/external/IAutomate.sol';
+import {IKeep3rV2} from '../interfaces/external/IKeep3rV2.sol';
 
 abstract contract Deploy is Script {
   // When new contracts need to be deployed, make sure to update the salt version to avoid address collition

diff --git a/solidity/test/integration/AutomationVault.t.sol b/solidity/test/integration/AutomationVault.t.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {CommonIntegrationTest} from '@test/integration/Common.t.sol';
+import {CommonIntegrationTest} from '../integration/Common.t.sol';
+import {IERC20, SafeERC20} from 'openzeppelin/token/ERC20/utils/SafeERC20.sol';
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
-import {IERC20, SafeERC20} from '@openzeppelin/token/ERC20/utils/SafeERC20.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
 import {_DAI_WHALE, _DAI} from './Constants.sol';
 
 contract IntegrationAutomationVault is CommonIntegrationTest {

diff --git a/solidity/test/integration/Common.t.sol b/solidity/test/integration/Common.t.sol
@@ -3,10 +3,10 @@ pragma solidity 0.8.19;
 
 import {Test} from 'forge-std/Test.sol';
 
-import {BasicJob} from '@contracts/for-test/BasicJob.sol';
-import {Deploy} from '@script/Deploy.s.sol';
-import {IAutomate} from '@interfaces/external/IAutomate.sol';
-import {IKeep3rV2} from '@interfaces/external/IKeep3rV2.sol';
+import {BasicJob} from '../../contracts/for-test/BasicJob.sol';
+import {Deploy} from '../../script/Deploy.s.sol';
+import {IAutomate} from '../../interfaces/external/IAutomate.sol';
+import {IKeep3rV2} from '../../interfaces/external/IKeep3rV2.sol';
 import {_KEEP3R_V2, _AUTOMATE} from './Constants.sol';
 
 contract DeployForTest is Deploy {

diff --git a/solidity/test/integration/Constants.sol b/solidity/test/integration/Constants.sol
@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
-import {IOpsProxyFactory} from '@interfaces/external/IOpsProxyFactory.sol';
-import {IKeep3rV2} from '@interfaces/external/IKeep3rV2.sol';
-import {IKeep3rV1} from '@interfaces/external/IKeep3rV1.sol';
-import {IKeep3rHelper} from '@interfaces/external/IKeep3rHelper.sol';
-import {IERC20} from '@openzeppelin/token/ERC20/utils/SafeERC20.sol';
-import {IAutomate} from '@interfaces/external/IAutomate.sol';
+import {IERC20} from 'openzeppelin/token/ERC20/utils/SafeERC20.sol';
+
+import {IOpsProxyFactory} from '../../interfaces/external/IOpsProxyFactory.sol';
+import {IKeep3rV2} from '../../interfaces/external/IKeep3rV2.sol';
+import {IKeep3rV1} from '../../interfaces/external/IKeep3rV1.sol';
+import {IKeep3rHelper} from '../../interfaces/external/IKeep3rHelper.sol';
+import {IAutomate} from '../../interfaces/external/IAutomate.sol';
 
 address constant _KEEP3R_GOVERNOR = 0x0D5Dc686d0a2ABBfDaFDFb4D0533E886517d4E83;
 address constant _KP3R_WHALE = 0x2FC52C61fB0C03489649311989CE2689D93dC1a2;

diff --git a/solidity/test/integration/Deploy.t.sol b/solidity/test/integration/Deploy.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {CommonIntegrationTest} from '@test/integration/Common.t.sol';
+import {CommonIntegrationTest} from '../integration/Common.t.sol';
 
 contract IntegrationDeploy is CommonIntegrationTest {
   function test_automationVaultParams() public {

diff --git a/solidity/test/integration/GelatoRelay.t.sol b/solidity/test/integration/GelatoRelay.t.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {CommonIntegrationTest} from '@test/integration/Common.t.sol';
+import {CommonIntegrationTest} from '../integration/Common.t.sol';
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
-import {IAutomate, LibDataTypes} from '@interfaces/external/IAutomate.sol';
-import {IGelato} from '@interfaces/external/IGelato.sol';
-import {IOpsProxyFactory} from '@interfaces/external/IOpsProxyFactory.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
+import {IAutomate, LibDataTypes} from '../../interfaces/external/IAutomate.sol';
+import {IGelato} from '../../interfaces/external/IGelato.sol';
+import {IOpsProxyFactory} from '../../interfaces/external/IOpsProxyFactory.sol';
 import {_NATIVE_TOKEN, _OPS_PROXY_FACTORY} from './Constants.sol';
 
 contract IntegrationGelatoRelay is CommonIntegrationTest {

diff --git a/solidity/test/integration/Keep3rRelay.t.sol b/solidity/test/integration/Keep3rRelay.t.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {CommonIntegrationTest} from '@test/integration/Common.t.sol';
+import {CommonIntegrationTest} from '../integration/Common.t.sol';
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
-import {IKeep3rV2} from '@interfaces/external/IKeep3rV2.sol';
-import {IKeep3rHelper} from '@interfaces/external/IKeep3rHelper.sol';
-import {IKeep3rV1} from '@interfaces/external/IKeep3rV1.sol';
-import {IKeep3rBondedRelay} from '@interfaces/relays/IKeep3rBondedRelay.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
+import {IKeep3rV2} from '../../interfaces/external/IKeep3rV2.sol';
+import {IKeep3rHelper} from '../../interfaces/external/IKeep3rHelper.sol';
+import {IKeep3rV1} from '../../interfaces/external/IKeep3rV1.sol';
+import {IKeep3rBondedRelay} from '../../interfaces/relays/IKeep3rBondedRelay.sol';
 import {_KEEP3R_V2, _KEEP3R_HELPER, _KEEP3R_V1, _KEEP3R_GOVERNOR, _KP3R_WHALE} from './Constants.sol';
 
 contract IntegrationKeep3rRelay is CommonIntegrationTest {

diff --git a/solidity/test/integration/OpenRelay.t.sol b/solidity/test/integration/OpenRelay.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.19;
 
-import {CommonIntegrationTest} from '@test/integration/Common.t.sol';
+import {CommonIntegrationTest} from '../integration/Common.t.sol';
 
-import {IAutomationVault} from '@interfaces/core/IAutomationVault.sol';
+import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
 
 contract IntegrationOpenRelay is CommonIntegrationTest {
   function setUp() public override {

diff --git a/solidity/test/unit/AutomationVault.t.sol b/solidity/test/unit/AutomationVault.t.sol
@@ -2,10 +2,10 @@
 pragma solidity 0.8.19;
 
 import {Test} from 'forge-std/Test.sol';
+import {IERC20} from 'openzeppelin/token/ERC20/IERC20.sol';
 
-import {AutomationVault, IAutomationVault, EnumerableSet} from '@contracts/core/AutomationVault.sol';
-import {IERC20} from '@openzeppelin/token/ERC20/IERC20.sol';
-import {_NATIVE_TOKEN, _ALL} from '@utils/Constants.sol';
+import {AutomationVault, IAutomationVault, EnumerableSet} from '../../contracts/core/AutomationVault.sol';
+import {_NATIVE_TOKEN, _ALL} from '../../utils/Constants.sol';
 
 contract AutomationVaultForTest is AutomationVault {
   using EnumerableSet for EnumerableSet.AddressSet;

diff --git a/solidity/test/unit/AutomationVaultFactory.t.sol b/solidity/test/unit/AutomationVaultFactory.t.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.19;
 
 import {Test} from 'forge-std/Test.sol';
 
-import {AutomationVaultFactory, EnumerableSet} from '@contracts/core/AutomationVaultFactory.sol';
-import {AutomationVault, IAutomationVault} from '@contracts/core/AutomationVault.sol';
+import {AutomationVaultFactory, EnumerableSet} from '../../contracts/core/AutomationVaultFactory.sol';
+import {AutomationVault, IAutomationVault} from '../../contracts/core/AutomationVault.sol';
 
 contract AutomationVaultFactoryForTest is AutomationVaultFactory {
   using EnumerableSet for EnumerableSet.AddressSet;

diff --git a/solidity/test/unit/GelatoRelay.t.sol b/solidity/test/unit/GelatoRelay.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.19;
 
 import {Test} from 'forge-std/Test.sol';
 
-import {GelatoRelay, IAutomationVault, IAutomate, IGelato} from '@contracts/relays/GelatoRelay.sol';
+import {GelatoRelay, IAutomationVault, IAutomate, IGelato} from '../../contracts/relays/GelatoRelay.sol';
 
 /**
  * @title GelatoRelay Unit tests

diff --git a/solidity/test/unit/Keep3rBondedRelay.t.sol b/solidity/test/unit/Keep3rBondedRelay.t.sol
@@ -9,7 +9,7 @@ import {
   IKeep3rBondedRelay,
   IAutomationVault,
   IKeep3rV2
-} from '@contracts/relays/Keep3rBondedRelay.sol';
+} from '../../contracts/relays/Keep3rBondedRelay.sol';
 
 contract Keep3rBondedRelayForTest is Keep3rBondedRelay {
   constructor(IKeep3rV2 _keep3rV2) Keep3rBondedRelay(_keep3rV2) {}