fix: openzeppelin

defi-wonderland · Apr 2, 2024 · 892cf41 · 892cf41
1 parent c0ec6e3
commit 892cf41
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/remappings.txt b/remappings.txt
@@ -1,3 +1,4 @@
 ds-test/=node_modules/ds-test/src
 forge-std/=node_modules/forge-std/src
-isolmate/=node_modules/isolmate/src
+isolmate/=node_modules/isolmate/src
+openzeppelin/=node_modules/@openzeppelin/contracts
diff --git a/solidity/contracts/core/AutomationVault.sol b/solidity/contracts/core/AutomationVault.sol
@@ -2,8 +2,8 @@
 pragma solidity 0.8.19;
 
 import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
-import {IERC20, SafeERC20} from '../../../node_modules/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
-import {EnumerableSet} from '../../../node_modules/@openzeppelin/contracts/utils/structs/EnumerableSet.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';
 
 /**

diff --git a/solidity/contracts/core/AutomationVaultFactory.sol b/solidity/contracts/core/AutomationVaultFactory.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.19;
 
 import {IAutomationVaultFactory} from '../../interfaces/core/IAutomationVaultFactory.sol';
 import {AutomationVault, IAutomationVault} from '../core/AutomationVault.sol';
-import {EnumerableSet} from '../../../node_modules/@openzeppelin/contracts//utils/structs/EnumerableSet.sol';
+import {EnumerableSet} from 'openzeppelin/utils/structs/EnumerableSet.sol';
 
 /**
  * @title  AutomationVaultFactory

diff --git a/solidity/contracts/periphery/XKeeperMetadata.sol b/solidity/contracts/periphery/XKeeperMetadata.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.19;
 
 import {IXKeeperMetadata} from '../../interfaces/periphery/IXKeeperMetadata.sol';
 import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
-import {EnumerableSet} from '../../../node_modules/@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
+import {EnumerableSet} from 'openzeppelin/utils/structs/EnumerableSet.sol';
 
 /**
  * @title  XKeeperMetadata

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 '../../../node_modules/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol';
+import {IERC20Metadata} from 'openzeppelin/token/ERC20/extensions/IERC20Metadata.sol';
 
 interface IKeep3rV1 is IERC20Metadata {}
diff --git a/solidity/test/integration/AutomationVault.t.sol b/solidity/test/integration/AutomationVault.t.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.19;
 import {CommonIntegrationTest} from '../integration/Common.t.sol';
 
 import {IAutomationVault} from '../../interfaces/core/IAutomationVault.sol';
-import {IERC20, SafeERC20} from '../../../node_modules/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
+import {IERC20, SafeERC20} from 'openzeppelin/token/ERC20/utils/SafeERC20.sol';
 import {_DAI_WHALE, _DAI} from './Constants.sol';
 
 contract IntegrationAutomationVault is CommonIntegrationTest {

diff --git a/solidity/test/integration/Constants.sol b/solidity/test/integration/Constants.sol
@@ -5,7 +5,7 @@ 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 '../../../node_modules/@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
+import {IERC20} from 'openzeppelin/token/ERC20/utils/SafeERC20.sol';
 import {IAutomate} from '../../interfaces/external/IAutomate.sol';
 
 address constant _KEEP3R_GOVERNOR = 0x0D5Dc686d0a2ABBfDaFDFb4D0533E886517d4E83;

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