Skip to content

Commit

Permalink
fix: add test for correct pathing
Browse files Browse the repository at this point in the history
  • Loading branch information
@sendra
sendra committed Mar 11, 2024
1 parent 2fbef74 commit 2a456d8
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 0 deletions.
10 changes: 10 additions & 0 deletions ...ulti_ADIAndBridgeAdaptersUpdate/AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,31 @@ import {MiscAvalanche} from 'aave-address-book/MiscAvalanche.sol';
import {GovernanceV3Avalanche} from 'aave-address-book/GovernanceV3Avalanche.sol';
import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
import './BaseTest.sol';
import {AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305.sol';

/**
* @dev Test for AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305
* command: make test-contract filter=AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305
*/
contract AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305_Test is ProtocolV3TestBase, BaseTest {
AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305 internal proposal;
AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305 internal ethereumPayload;

function setUp() public {
ccc = GovernanceV3Avalanche.CROSS_CHAIN_CONTROLLER;
proxyAdmin = MiscAvalanche.PROXY_ADMIN;

vm.createSelectFork(vm.rpcUrl('avalanche'), 42502057);
proposal = new AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305();
ethereumPayload = new AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305();
}

/**
* @dev executes the generic test suite including e2e and config snapshots
*/
function test_defaultProposalExecution() public {
_testTrustedRemotes();
_testCorrectPathConfiguration();

_testCurrentReceiversAreAllowed();
_testAllReceiversAreRepresented();
Expand All @@ -43,6 +47,12 @@ contract AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305_Test is ProtocolV3T
_testImplementationAddress(proposal.NEW_CROSS_CHAIN_CONTROLLER_IMPLEMENTATION(), true);
}

function _testCorrectPathConfiguration() internal {
assertEq(ethereumPayload.CCIP_NEW_ADAPTER(), proposal.DESTINATION_CCIP_NEW_ADAPTER());
assertEq(ethereumPayload.LZ_NEW_ADAPTER(), proposal.DESTINATION_LZ_NEW_ADAPTER()());
assertEq(ethereumPayload.HL_NEW_ADAPTER(), proposal.DESTINATION_HL_NEW_ADAPTER());
}

function _testTrustedRemotes() internal {
_testTrustedRemoteByChain(
proposal.CCIP_NEW_ADAPTER(),
Expand Down
52 changes: 52 additions & 0 deletions ...Multi_ADIAndBridgeAdaptersUpdate/AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,55 @@ import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
import {GovernanceV3Polygon} from 'aave-address-book/GovernanceV3Polygon.sol';
import {GovernanceV3Avalanche} from 'aave-address-book/GovernanceV3Avalanche.sol';
import './BaseTest.sol';
import {AaveV3Arbitrum_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Arbitrum_ADIAndBridgeAdaptersUpdate_20240305.sol';
import {AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305.sol';
import {AaveV3Base_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Base_ADIAndBridgeAdaptersUpdate_20240305.sol';
import {AaveV3BNB_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3BNB_ADIAndBridgeAdaptersUpdate_20240305.sol';
import {AaveV3Gnosis_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Gnosis_ADIAndBridgeAdaptersUpdate_20240305.sol';
import {AaveV3Metis_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Metis_ADIAndBridgeAdaptersUpdate_20240305.sol';
import {AaveV3Optimism_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Optimism_ADIAndBridgeAdaptersUpdate_20240305.sol';
import {AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305.sol';
import {AaveV3Scroll_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Scroll_ADIAndBridgeAdaptersUpdate_20240305.sol';

/**
* @dev Test for AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305
* command: make test-contract filter=AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305
*/
contract AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305_Test is ProtocolV3TestBase, BaseTest {
AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305 internal proposal;
AaveV3Arbitrum_ADIAndBridgeAdaptersUpdate_20240305 internal arbitrumPayload;
AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305 internal avalanchePayload;
AaveV3Base_ADIAndBridgeAdaptersUpdate_20240305 internal basePayload;
AaveV3BNB_ADIAndBridgeAdaptersUpdate_20240305 internal bnbPayload;
AaveV3Gnosis_ADIAndBridgeAdaptersUpdate_20240305 internal gnosisPayload;
AaveV3Metis_ADIAndBridgeAdaptersUpdate_20240305 internal metisPayload;
AaveV3Optimism_ADIAndBridgeAdaptersUpdate_20240305 internal optimismPayload;
AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305 internal polygonPayload;
AaveV3Scroll_ADIAndBridgeAdaptersUpdate_20240305 internal scrollPayload;

function setUp() public {
ccc = GovernanceV3Ethereum.CROSS_CHAIN_CONTROLLER;
proxyAdmin = MiscEthereum.PROXY_ADMIN;

vm.createSelectFork(vm.rpcUrl('mainnet'), 19367957);
proposal = new AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305();
arbitrumPayload = new AaveV3Arbitrum_ADIAndBridgeAdaptersUpdate_20240305();
avalanchePayload = new AaveV3Avalanche_ADIAndBridgeAdaptersUpdate_20240305();
basePayload = new AaveV3Base_ADIAndBridgeAdaptersUpdate_20240305();
bnbPayload = new AaveV3BNB_ADIAndBridgeAdaptersUpdate_20240305();
gnosisPayload = new AaveV3Gnosis_ADIAndBridgeAdaptersUpdate_20240305();
metisPayload = new AaveV3Metis_ADIAndBridgeAdaptersUpdate_20240305();
optimismPayload = new AaveV3Optimism_ADIAndBridgeAdaptersUpdate_20240305();
polygonPayload = new AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305();
scrollPayload = new AaveV3Scroll_ADIAndBridgeAdaptersUpdate_20240305();
}

/**
* @dev executes the generic test suite including e2e and config snapshots
*/
function test_defaultProposalExecution() public {
_testTrustedRemotes();
_testCorrectPathConfiguration();

_testCurrentReceiversAreAllowed();
_testCurrentForwarders();
Expand All @@ -44,6 +72,30 @@ contract AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305_Test is ProtocolV3Te
_testImplementationAddress(proposal.NEW_CROSS_CHAIN_CONTROLLER_IMPLEMENTATION(), true);
}

function _testCorrectPathConfiguration() internal {
assertEq(proposal.DESTINATION_ARB_NEW_ADAPTER(), arbitrumPayload.NEW_ADAPTER()());
assertEq(
proposal.DESTINATION_CCIP_NEW_ADAPTER_AVALANCHE(),
avalanchePayload.CCIP_NEW_ADAPTER()
);
assertEq(proposal.DESTINATION_LZ_NEW_ADAPTER_AVALANCHE(), avalanchePayload.LZ_NEW_ADAPTER()());
assertEq(proposal.DESTINATION_HL_NEW_ADAPTER_AVALANCHE(), avalanchePayload.HL_NEW_ADAPTER());
assertEq(proposal.DESTINATION_BASE_NEW_ADAPTER(), basePayload.NEW_ADAPTER());
assertEq(proposal.DESTINATION_CCIP_NEW_ADAPTER_BNB(), bnbPayload.CCIP_NEW_ADAPTER());
assertEq(proposal.DESTINATION_LZ_NEW_ADAPTER_BNB(), bnbPayload.LZ_NEW_ADAPTER());
assertEq(proposal.DESTINATION_HL_NEW_ADAPTER_BNB(), bnbPayload.HL_NEW_ADAPTER());
assertEq(proposal.DESTINATION_GNOSIS_NEW_ADAPTER(), gnosisPayload.GNOSIS_NEW_ADAPTER());
assertEq(proposal.DESTINATION_LZ_NEW_ADAPTER_GNOSIS(), gnosisPayload.LZ_NEW_ADAPTER());
assertEq(proposal.DESTINATION_HL_NEW_ADAPTER_GNOSIS(), gnosisPayload.HL_NEW_ADAPTER());
assertEq(proposal.DESTINATION_METIS_NEW_ADAPTER(), metisPayload.NEW_ADAPTER());
assertEq(proposal.DESTINATION_OPT_NEW_ADAPTER(), optimismPayload.NEW_ADAPTER());
assertEq(proposal.DESTINATION_CCIP_NEW_ADAPTER_POLYGON(), polygonPayload.CCIP_NEW_ADAPTER());
assertEq(proposal.DESTINATION_LZ_NEW_ADAPTER_POLYGON(), polygonPayload.LZ_NEW_ADAPTER());
assertEq(proposal.DESTINATION_HL_NEW_ADAPTER_POLYGON(), polygonPayload.HL_NEW_ADAPTER());
assertEq(proposal.DESTINATION_POL_NEW_ADAPTER(), polygonPayload.HL_POL_ADAPTER());
assertEq(proposal.DESTINATION_SCROLL_NEW_ADAPTER(), scrollPayload.NEW_ADAPTER());
}

function _testTrustedRemotes() internal {
_testTrustedRemoteByChain(
proposal.CCIP_NEW_ADAPTER(),
Expand Down
11 changes: 11 additions & 0 deletions ..._Multi_ADIAndBridgeAdaptersUpdate/AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,31 @@ import {MiscPolygon} from 'aave-address-book/MiscPolygon.sol';
import {GovernanceV3Polygon} from 'aave-address-book/GovernanceV3Polygon.sol';
import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
import './BaseTest.sol';
import {AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305} from './AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305.sol';

/**
* @dev Test for AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305
* command: make test-contract filter=AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305
*/
contract AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305_Test is ProtocolV3TestBase, BaseTest {
AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305 internal proposal;
AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305 internal ethereumPayload;

function setUp() public {
ccc = GovernanceV3Polygon.CROSS_CHAIN_CONTROLLER;
proxyAdmin = MiscPolygon.PROXY_ADMIN;

vm.createSelectFork(vm.rpcUrl('polygon'), 54289111);
proposal = new AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305();
ethereumPayload = new AaveV3Ethereum_ADIAndBridgeAdaptersUpdate_20240305();
}

/**
* @dev executes the generic test suite including e2e and config snapshots
*/
function test_defaultProposalExecution() public {
_testTrustedRemotes();
_testCorrectPathConfiguration();

_testCurrentReceiversAreAllowed();
_testAllReceiversAreRepresented();
Expand All @@ -43,6 +47,13 @@ contract AaveV3Polygon_ADIAndBridgeAdaptersUpdate_20240305_Test is ProtocolV3Tes
_testImplementationAddress(proposal.NEW_CROSS_CHAIN_CONTROLLER_IMPLEMENTATION(), true);
}

function _testCorrectPathConfiguration() internal {
assertEq(ethereumPayload.CCIP_NEW_ADAPTER(), proposal.DESTINATION_CCIP_NEW_ADAPTER());
assertEq(ethereumPayload.LZ_NEW_ADAPTER(), proposal.DESTINATION_LZ_NEW_ADAPTER()());
assertEq(ethereumPayload.HL_NEW_ADAPTER(), proposal.DESTINATION_HL_NEW_ADAPTER());
assertEq(ethereumPayload.POL_NEW_ADAPTER()(), proposal.DESTINATION_POL_NEW_ADAPTER());
}

function _testTrustedRemotes() internal {
_testTrustedRemoteByChain(
proposal.CCIP_NEW_ADAPTER(),
Expand Down

0 comments on commit 2a456d8

Please sign in to comment.