Skip to content

Commit 8c4cf2a

Browse files
authored
fix: cleanup dependencies (#188)
1 parent e12132f commit 8c4cf2a

File tree

7 files changed

+9
-21
lines changed

7 files changed

+9
-21
lines changed

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
[submodule "lib/@gearbox-protocol/core-v3"]
55
path = lib/@gearbox-protocol/core-v3
66
url = https://github.com/Gearbox-protocol/core-v3
7-
[submodule "lib/@gearbox-protocol/oracles-v3"]
8-
path = lib/@gearbox-protocol/oracles-v3
9-
url = https://github.com/Gearbox-protocol/oracles-v3
107
[submodule "lib/@1inch/solidity-utils"]
118
path = lib/@1inch/solidity-utils
129
url = https://github.com/1inch/solidity-utils
@@ -16,4 +13,3 @@
1613
[submodule "lib/@gearbox-protocol/permissionless"]
1714
path = lib/@gearbox-protocol/permissionless
1815
url = https://github.com/Gearbox-protocol/permissionless
19-
branch = attach-test-base

contracts/test/attach/IntegrationsAttachTestBase.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
66
import {ICreditFacadeV3, MultiCall} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditFacadeV3.sol";
77
import {ICreditManagerV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditManagerV3.sol";
88

9-
import {ConstantPriceFeed} from "@gearbox-protocol/oracles-v3/contracts/oracles/ConstantPriceFeed.sol";
9+
import {ConstantPriceFeed} from "@gearbox-protocol/permissionless/contracts/helpers/ConstantPriceFeed.sol";
1010

1111
import {AttachTestBase} from "@gearbox-protocol/permissionless/contracts/test/suite/AttachTestBase.sol";
1212

@@ -31,7 +31,7 @@ abstract contract IntegrationsAttachTestBase is AttachTestBase {
3131

3232
zeroPriceFeed = priceFeedStore.zeroPriceFeed();
3333
if (bytecodeRepository.getAllowedBytecodeHash("PRICE_FEED::CONSTANT", 3_10) == 0) {
34-
// NOTE: this would fail on deployment if we bump `ConstantPriceFeed` to v3.1.1 in the oracles repo,
34+
// NOTE: this would fail on deployment if we bump `ConstantPriceFeed` to v3.1.1 in the permissionless repo,
3535
// but we assume that in this case v3.1.0 would already be uploaded to the bytecode repository
3636
_uploadContract("PRICE_FEED::CONSTANT", 3_10, type(ConstantPriceFeed).creationCode);
3737
}

contracts/test/attach/kelp/KelpLRT.attach.t.sol

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ contract KelpLRTAttachTest is IntegrationsAttachTestBase {
3232
mapping(address token => address) withdrawalTokens;
3333

3434
function setUp() public {
35-
vm.setEvmVersion("osaka");
3635
super._setUp();
3736

3837
vm.skip(block.chainid != 1, "Not Ethereum mainnet");

contracts/test/suites/LiveTestHelper.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
PendlePair
2323
} from "@gearbox-protocol/core-v3/contracts/test/interfaces/ICreditConfig.sol";
2424

25-
import {PriceFeedDeployer} from "@gearbox-protocol/oracles-v3/contracts/test/suites/PriceFeedDeployer.sol";
25+
// import {PriceFeedDeployer} from "@gearbox-protocol/oracles-v3/contracts/test/suites/PriceFeedDeployer.sol";
2626
import {IntegrationTestHelper} from "@gearbox-protocol/core-v3/contracts/test/helpers/IntegrationTestHelper.sol";
2727
import {AdapterDeployer} from "./AdapterDeployer.sol";
2828

@@ -121,10 +121,10 @@ contract LiveTestHelper is IntegrationTestHelper {
121121
_setupCore();
122122
supportedContracts = new SupportedContracts(chainId);
123123

124-
PriceFeedDeployer priceFeedDeployer =
125-
new PriceFeedDeployer(chainId, address(acl), tokenTestSuite, supportedContracts);
124+
// PriceFeedDeployer priceFeedDeployer =
125+
// new PriceFeedDeployer(chainId, address(acl), tokenTestSuite, supportedContracts);
126126

127-
priceFeedDeployer.addPriceFeeds(address(priceOracle));
127+
// priceFeedDeployer.addPriceFeeds(address(priceOracle));
128128

129129
IPoolV3DeployConfig config = getDeployConfig(id);
130130

foundry.lock

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,10 @@
1111
"rev": "5144d61af7d117f86d3fa9b4e2aa05535e2e5433"
1212
}
1313
},
14-
"lib/@gearbox-protocol/oracles-v3": {
15-
"tag": {
16-
"name": "v1.15.1",
17-
"rev": "69c12f58da99281f03ac2c650c0793ba7c30ae38"
18-
}
19-
},
2014
"lib/@gearbox-protocol/permissionless": {
2115
"tag": {
22-
"name": "v1.6.0",
23-
"rev": "3ba16c017863ba2d68d957b32ffeed9778f481b8"
16+
"name": "v1.7.0",
17+
"rev": "0aab5ecec6de72176d7d2a8fae2cfa905d0206af"
2418
}
2519
},
2620
"lib/@gearbox-protocol/sdk-gov": {

lib/@gearbox-protocol/oracles-v3

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)