Merge pull request #20 from bgd-labs/refactor/import

refactor: change imports
Certora · Apr 5, 2023 · e12f827 · e12f827
2 parents f32516f + 3363a97
commit e12f827
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/.env.example b/.env.example
@@ -1,2 +1,2 @@
-ETH_RPC_URL=https://eth-mainnet.alchemyapi.io/v2/ALCHEMY_API_KEY
+RPC_MAINNET=https://eth-mainnet.alchemyapi.io/v2/ALCHEMY_API_KEY
 FORK_BLOCK=someBlockNumber
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ build  :; forge build --sizes
 .PHONY : test
 
 # IMPORTANT It is highly probable that will be necessary to modify the --fork-block-number, depending on the test
-test   :; forge test -vvv --rpc-url=${ETH_RPC_URL} --fork-block-number ${FORK_BLOCK}
-trace   :; forge test -vvvv --rpc-url=${ETH_RPC_URL}
+test   :; forge test -vvv --rpc-url=${RPC_MAINNET} --fork-block-number ${FORK_BLOCK}
+trace   :; forge test -vvvv --rpc-url=${RPC_MAINNET}
 clean  :; forge clean
-snapshot :; forge snapshot
+snapshot :; forge snapshot
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/remappings.txt b/remappings.txt
@@ -0,0 +1,4 @@
+aave-token-v2/=lib/aave-token-v2/contracts/
+ds-test/=lib/forge-std/lib/ds-test/src/
+forge-std/=lib/forge-std/src/
+openzeppelin-contracts/=lib/openzeppelin-contracts/
diff --git a/src/BaseAaveToken.sol b/src/BaseAaveToken.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {Context} from '../lib/openzeppelin-contracts/contracts/utils/Context.sol';
-import {IERC20} from '../lib/openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
-import {IERC20Metadata} from '../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
+import {Context} from 'openzeppelin-contracts/contracts/utils/Context.sol';
+import {IERC20} from 'openzeppelin-contracts/contracts/token/ERC20/IERC20.sol';
+import {IERC20Metadata} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import {DelegationMode} from './DelegationAwareBalance.sol';
 
 // Inspired by OpenZeppelin Contracts (last updated v4.5.0) (token/ERC20/ERC20.sol)

diff --git a/src/test/InternalDelegationFunctionsTest.t.sol b/src/test/InternalDelegationFunctionsTest.t.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {Strings} from '../../lib/openzeppelin-contracts/contracts/utils/Strings.sol';
-import {IERC20Metadata} from '../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
+import {Strings} from 'openzeppelin-contracts/contracts/utils/Strings.sol';
+import {IERC20Metadata} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import {AaveTokenV3} from '../AaveTokenV3.sol';
 import {DelegationMode} from '../DelegationAwareBalance.sol';
 

diff --git a/src/test/StorageTest.t.sol b/src/test/StorageTest.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IERC20Metadata} from '../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
+import {IERC20Metadata} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 import {AaveTokenV3} from '../AaveTokenV3.sol';
 
 import {AaveUtils, console} from './utils/AaveUtils.sol';

diff --git a/src/test/utils/AaveUtils.sol b/src/test/utils/AaveUtils.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 
-import {IERC20Metadata} from '../../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
+import {IERC20Metadata} from 'openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol';
 
 import {AaveTokenV3} from '../../AaveTokenV3.sol';
+92 −0		.github/workflows/ci.yml
+0 −26		.github/workflows/tests.yml
+2 −0		.gitignore
+1 −1		LICENSE-APACHE
+1 −1		LICENSE-MIT
+9 −5		README.md
+21 −0		foundry.toml
+1 −1		lib/ds-test
+16 −0		package.json
+33 −0		src/Base.sol
+26 −0		src/Script.sol
+376 −0		src/StdAssertions.sol
+233 −0		src/StdChains.sol
+639 −0		src/StdCheats.sol
+15 −0		src/StdError.sol
+92 −0		src/StdInvariant.sol
+179 −0		src/StdJson.sol
+43 −0		src/StdMath.sol
+327 −0		src/StdStorage.sol
+333 −0		src/StdStyle.sol
+189 −0		src/StdUtils.sol
+31 −681		src/Test.sol
+410 −55		src/Vm.sol
+14 −6		src/console2.sol
+105 −0		src/interfaces/IERC1155.sol
+12 −0		src/interfaces/IERC165.sol
+43 −0		src/interfaces/IERC20.sol
+190 −0		src/interfaces/IERC4626.sol
+164 −0		src/interfaces/IERC721.sol
+73 −0		src/interfaces/IMulticall3.sol
+0 −379		src/test/StdAssertions.t.sol
+0 −193		src/test/StdCheats.t.sol
+0 −200		src/test/StdMath.t.sol
+999 −0		test/StdAssertions.t.sol
+160 −0		test/StdChains.t.sol
+418 −0		test/StdCheats.t.sol
+6 −12		test/StdError.t.sol
+197 −0		test/StdMath.t.sol
+63 −86		test/StdStorage.t.sol
+110 −0		test/StdStyle.t.sol
+297 −0		test/StdUtils.t.sol
+10 −0		test/compilation/CompilationScript.sol
+10 −0		test/compilation/CompilationScriptBase.sol
+10 −0		test/compilation/CompilationTest.sol
+10 −0		test/compilation/CompilationTestBase.sol
+187 −0		test/fixtures/broadcast.log.json