Skip to content

Commit 4f99c46

Browse files
committed
fix: clean up param registry naming; horizon addrs deps
1 parent 9f063a1 commit 4f99c46

File tree

6 files changed

+18
-62
lines changed

6 files changed

+18
-62
lines changed

scripts/misc/DeployHorizonPhaseTwoPayload.sol

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: BUSL-1.1
22
pragma solidity ^0.8.0;
33

4-
import {AaveV3HorizonEthereum} from 'tests/horizon/utils/AaveV3HorizonEthereum.sol';
4+
import {AaveV3EthereumHorizonCustom} from 'tests/horizon/utils/AaveV3EthereumHorizonCustom.sol';
55
import {HorizonPhaseTwoListing} from 'src/deployments/inputs/HorizonPhaseTwoListing.sol';
66
import {AaveV3HelpersBatchOne} from 'src/deployments/projects/aave-v3-batched/batches/AaveV3HelpersBatchOne.sol';
77
import {AaveV3ConfigEngine} from 'src/contracts/extensions/v3-config-engine/AaveV3ConfigEngine.sol';
@@ -11,14 +11,14 @@ contract DeployHorizonPhaseTwoPayload is Script {
1111
function run() public returns (address, address) {
1212
vm.startBroadcast();
1313
AaveV3HelpersBatchOne helpersBatchOne = new AaveV3HelpersBatchOne(
14-
AaveV3HorizonEthereum.POOL,
15-
AaveV3HorizonEthereum.POOL_CONFIGURATOR,
16-
AaveV3HorizonEthereum.DEFAULT_INTEREST_RATE_STRATEGY,
17-
AaveV3HorizonEthereum.AAVE_ORACLE,
18-
AaveV3HorizonEthereum.REWARDS_CONTROLLER,
19-
AaveV3HorizonEthereum.REVENUE_SPLITTER,
20-
AaveV3HorizonEthereum.ATOKEN_IMPLEMENTATION,
21-
AaveV3HorizonEthereum.VARIABLE_DEBT_TOKEN_IMPLEMENTATION
14+
AaveV3EthereumHorizonCustom.POOL,
15+
AaveV3EthereumHorizonCustom.POOL_CONFIGURATOR,
16+
AaveV3EthereumHorizonCustom.DEFAULT_INTEREST_RATE_STRATEGY,
17+
AaveV3EthereumHorizonCustom.AAVE_ORACLE,
18+
AaveV3EthereumHorizonCustom.REWARDS_CONTROLLER,
19+
AaveV3EthereumHorizonCustom.REVENUE_SPLITTER,
20+
AaveV3EthereumHorizonCustom.ATOKEN_IMPLEMENTATION,
21+
AaveV3EthereumHorizonCustom.VARIABLE_DEBT_TOKEN_IMPLEMENTATION
2222
);
2323

2424
HorizonPhaseTwoListing horizonPhaseTwoListing = new HorizonPhaseTwoListing(

tests/deployments/HorizonBase.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {IPool} from '../../src/contracts/interfaces/IPool.sol';
2525
import {IPoolConfigurator} from '../../src/contracts/interfaces/IPoolConfigurator.sol';
2626
import {Errors} from '../../src/contracts/protocol/libraries/helpers/Errors.sol';
2727
import {ProxyHelpers} from '../utils/ProxyHelpers.sol';
28-
import {IParameterRegistry} from '../horizon/dependencies/IParameterRegistry.sol';
28+
import {IRwaOracleParameterRegistry} from '../horizon/dependencies/IRwaOracleParameterRegistry.sol';
2929
import {AaveV3EthereumHorizonCustom} from '../horizon/utils/AaveV3EthereumHorizonCustom.sol';
3030

3131
abstract contract HorizonBaseTest is Test {

tests/deployments/HorizonPhaseTwoListing.t.sol

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@ contract HorizonPhaseTwoListingTest is HorizonBaseTest {
8080

8181
function test_param_registry_VBILL() public {
8282
assertEq(
83-
IParameterRegistry(AaveV3EthereumHorizonCustom.RWA_ORACLE_PARAMS_REGISTRY).assetExists(
84-
AaveV3EthereumHorizonCustom.VBILL_UNDERLYING
85-
),
83+
IRwaOracleParameterRegistry(AaveV3EthereumHorizonCustom.RWA_ORACLE_PARAMS_REGISTRY)
84+
.assetExists(AaveV3EthereumHorizonCustom.VBILL_UNDERLYING),
8685
true,
8786
'assetExists'
8887
);

tests/horizon/OracleDynamicBounds.t.sol

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {AggregatorInterface} from '../../src/contracts/dependencies/chainlink/Ag
1010

1111
import {AaveV3EthereumHorizonCustom} from './utils/AaveV3EthereumHorizonCustom.sol';
1212

13-
import {IParameterRegistry} from './dependencies/IParameterRegistry.sol';
13+
import {IRwaOracleParameterRegistry} from './dependencies/IRwaOracleParameterRegistry.sol';
1414

1515
abstract contract OracleDynamicBoundsTestBase is Test {
1616
address constant USTB_NEW_AGGREGATOR = 0x267D0DD05fbc989565C521e0B8882f61027FF32A;
@@ -39,9 +39,11 @@ abstract contract OracleDynamicBoundsTestBase is Test {
3939
mapping(address => NewAggregator) internal newAggregators; // asset => new aggregator
4040

4141
IAaveOracle internal aaveOracle;
42-
IParameterRegistry internal parameterRegistry;
42+
IRwaOracleParameterRegistry internal parameterRegistry;
4343
function setUp() public virtual {
44-
parameterRegistry = IParameterRegistry(AaveV3EthereumHorizonCustom.RWA_ORACLE_PARAMS_REGISTRY);
44+
parameterRegistry = IRwaOracleParameterRegistry(
45+
AaveV3EthereumHorizonCustom.RWA_ORACLE_PARAMS_REGISTRY
46+
);
4547
}
4648

4749
function test_asset(address asset, address oracleSource, bool isAdapter) internal {

tests/horizon/dependencies/IParameterRegistry.sol renamed to tests/horizon/dependencies/IRwaOracleParameterRegistry.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity ^0.8.0;
33

44
/// @dev minimal interface for the Llama Risk RWA Oracle parameter registry
5-
interface IParameterRegistry {
5+
interface IRwaOracleParameterRegistry {
66
function assetExists(address asset) external view returns (bool);
77

88
function getParametersForAsset(

tests/horizon/utils/AaveV3HorizonEthereum.sol

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)