From aaf3f09ba4da51767ec0ba42473f9b8dd856e445 Mon Sep 17 00:00:00 2001 From: Matthew Pereira Date: Sat, 9 Dec 2023 14:36:45 -0800 Subject: [PATCH] imports resolving without error --- foundry.toml | 5 ----- remappings.txt | 1 + src/test/AuraERC4626Adaptor.t.sol | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/foundry.toml b/foundry.toml index bbf4f36..69e6693 100644 --- a/foundry.toml +++ b/foundry.toml @@ -2,11 +2,6 @@ src = 'src' out = 'out' libs = ['lib'] -remappings = [ - 'forge-std/=lib/forge-std/src/', - '@yearnvaults/=lib/yearn-vaults/', - '@openzeppelin/=lib/openzeppelin-contracts/' -] fs_permissions = [{ access = "read", path = "./"}] # See more config options https://github.com/gakonst/foundry/tree/master/config diff --git a/remappings.txt b/remappings.txt index 603e127..e3d52c6 100644 --- a/remappings.txt +++ b/remappings.txt @@ -2,3 +2,4 @@ @openzeppelin/=lib/openzeppelin-contracts/ forge-std/=lib/forge-std/src/ @cellar-contracts/=lib/cellar-contracts/ +@balancer=lib/cellar-contracts/lib/balancer-v2-monorepo/pkg \ No newline at end of file diff --git a/src/test/AuraERC4626Adaptor.t.sol b/src/test/AuraERC4626Adaptor.t.sol index d20a9f8..3275f4e 100644 --- a/src/test/AuraERC4626Adaptor.t.sol +++ b/src/test/AuraERC4626Adaptor.t.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.21; import { MockDataFeed } from "@cellar-contracts/src/mocks/MockDataFeed.sol"; // Import Everything from Starter file. -import {MainnetStarterTest} from "lib/cellar-contracts/test/resources/MainnetStarter.t.sol"; -import { AdaptorHelperFunctions } from "lib/cellar-contracts/test/resources/AdaptorHelperFunctions.sol"; +import {MainnetStarterTest} from "@cellar-contracts/test/resources/MainnetStarter.t.sol"; +import { AdaptorHelperFunctions } from "@cellar-contracts/test/resources/AdaptorHelperFunctions.sol"; import { IVault, IERC20 } from "@balancer/interfaces/contracts/vault/IVault.sol"; import { BalancerStablePoolExtension } from "@cellar-contracts/src/modules/price-router/Extensions/Balancer/BalancerStablePoolExtension.sol"; import { AuraERC4626Adaptor } from "src/AuraERC4626Adaptor.sol";