fix: base test contract and refactor folders

aave-dao · Nov 30, 2024 · c56cbc2 · c56cbc2
1 parent fb6aa44
commit c56cbc2
Show file tree

Hide file tree

Showing 26 changed files with 231 additions and 199 deletions.
diff --git a/lib/aave-helpers b/lib/aave-helpers
diff --git a/scripts/RiskStewardsBase.s.sol b/scripts/RiskStewardsBase.s.sol
diff --git a/src/contracts/examples/ArbitrumExample.sol b/src/contracts/examples/ArbitrumExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3ArbitrumAssets} from 'aave-address-book/AaveV3Arbitrum.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsArbitrum} from '../../../scripts/networks/RiskStewardsArbitrum.s.sol';
+import {RiskStewardsArbitrum} from '../payload-helpers/networks/RiskStewardsArbitrum.t.sol';
 
 // make run-script network=arbitrum contract=src/contracts/examples/ArbitrumExample.sol:ArbitrumExample broadcast=false generate_diff=true
 contract ArbitrumExample is RiskStewardsArbitrum {

diff --git a/src/contracts/examples/AvalancheExample.sol b/src/contracts/examples/AvalancheExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3AvalancheAssets} from 'aave-address-book/AaveV3Avalanche.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsAvalanche} from '../../../scripts/networks/RiskStewardsAvalanche.s.sol';
+import {RiskStewardsAvalanche} from '../payload-helpers/networks/RiskStewardsAvalanche.t.sol';
 
 // make run-script network=avalanche contract=src/contracts/examples/AvalancheExample.sol:AvalancheExample broadcast=false generate_diff=true
 contract AvalancheExample is RiskStewardsAvalanche {

diff --git a/src/contracts/examples/BNBExample.sol b/src/contracts/examples/BNBExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3BNBAssets} from 'aave-address-book/AaveV3BNB.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsBNB} from '../../../scripts/networks/RiskStewardsBNB.s.sol';
+import {RiskStewardsBNB} from '../payload-helpers/networks/RiskStewardsBNB.t.sol';
 
 // make run-script network=bnb contract=src/contracts/examples/BNBExample.sol:BNBExample broadcast=false generate_diff=true
 contract BNBExample is RiskStewardsBNB {

diff --git a/src/contracts/examples/BaseExample.sol b/src/contracts/examples/BaseExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3BaseAssets} from 'aave-address-book/AaveV3Base.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsBaseChain} from '../../../scripts/networks/RiskStewardsBaseChain.s.sol';
+import {RiskStewardsBaseChain} from '../payload-helpers/networks/RiskStewardsBaseChain.t.sol';
 
 // make run-script network=base contract=src/contracts/examples/BaseExample.sol:BaseExample broadcast=false generate_diff=true
 contract BaseExample is RiskStewardsBaseChain {

diff --git a/src/contracts/examples/EthereumExample.sol b/src/contracts/examples/EthereumExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsEthereum} from '../../../scripts/networks/RiskStewardsEthereum.s.sol';
+import {RiskStewardsEthereum} from '../payload-helpers/networks/RiskStewardsEthereum.t.sol';
 import {IRiskSteward, IPriceCapAdapter} from '../../interfaces/IRiskSteward.sol';
 
 // make run-script network=mainnet contract=src/contracts/examples/EthereumExample.sol:EthereumExample broadcast=false generate_diff=true

diff --git a/src/contracts/examples/EthereumLidoExample.sol b/src/contracts/examples/EthereumLidoExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3EthereumLidoAssets} from 'aave-address-book/AaveV3EthereumLido.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsEthereumLido} from '../../../scripts/networks/RiskStewardsEthereumLido.s.sol';
+import {RiskStewardsEthereumLido} from '../payload-helpers/networks/RiskStewardsEthereumLido.t.sol';
 
 // make run-script network=mainnet contract=src/contracts/examples/EthereumLidoExample.sol:EthereumLidoExample broadcast=false generate_diff=true
 contract EthereumLidoExample is RiskStewardsEthereumLido {

diff --git a/src/contracts/examples/GnosisExample.sol b/src/contracts/examples/GnosisExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3GnosisAssets} from 'aave-address-book/AaveV3Gnosis.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsGnosis} from '../../../scripts/networks/RiskStewardsGnosis.s.sol';
+import {RiskStewardsGnosis} from '../payload-helpers/networks/RiskStewardsGnosis.t.sol';
 
 // make run-script network=gnosis contract=src/contracts/examples/GnosisExample.sol:GnosisExample broadcast=false generate_diff=true
 contract GnosisExample is RiskStewardsGnosis {

diff --git a/src/contracts/examples/MetisExample.sol b/src/contracts/examples/MetisExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3MetisAssets} from 'aave-address-book/AaveV3Metis.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsMetis} from '../../../scripts/networks/RiskStewardsMetis.s.sol';
+import {RiskStewardsMetis} from '../payload-helpers/networks/RiskStewardsMetis.t.sol';
 
 // make run-script network=metis contract=src/contracts/examples/MetisExample.sol:MetisExample broadcast=false generate_diff=true
 contract MetisExample is RiskStewardsMetis {

diff --git a/src/contracts/examples/OptimismExample.sol b/src/contracts/examples/OptimismExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3OptimismAssets} from 'aave-address-book/AaveV3Optimism.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsOptimism} from '../../../scripts/networks/RiskStewardsOptimism.s.sol';
+import {RiskStewardsOptimism} from '../payload-helpers/networks/RiskStewardsOptimism.t.sol';
 
 // make run-script network=optimism contract=src/contracts/examples/OptimismExample.sol:OptimismExample broadcast=false generate_diff=true
 contract OptimismExample is RiskStewardsOptimism {

diff --git a/src/contracts/examples/PolygonExample.sol b/src/contracts/examples/PolygonExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3PolygonAssets} from 'aave-address-book/AaveV3Polygon.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsPolygon} from '../../../scripts/networks/RiskStewardsPolygon.s.sol';
+import {RiskStewardsPolygon} from '../payload-helpers/networks/RiskStewardsPolygon.t.sol';
 
 // make run-script network=polygon contract=src/contracts/examples/PolygonExample.sol:PolygonExample broadcast=false generate_diff=true
 contract PolygonExample is RiskStewardsPolygon {

diff --git a/src/contracts/examples/ScrollExample.sol b/src/contracts/examples/ScrollExample.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import {AaveV3ScrollAssets} from 'aave-address-book/AaveV3Scroll.sol';
 import {IAaveV3ConfigEngine as IEngine} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {EngineFlags} from 'aave-v3-origin/src/contracts/extensions/v3-config-engine/EngineFlags.sol';
-import {RiskStewardsScroll} from '../../../scripts/networks/RiskStewardsScroll.s.sol';
+import {RiskStewardsScroll} from '../payload-helpers/networks/RiskStewardsScroll.t.sol';
 
 // make run-script network=scroll contract=src/contracts/examples/ScrollExample.sol:ScrollExample broadcast=false generate_diff=true
 contract ScrollExample is RiskStewardsScroll {
+8 −8		src/ProtocolV2TestBase.sol
+7 −7		src/ProtocolV3TestBase.sol
+14 −20		src/swaps/AaveSwapper.sol
+109 −0		src/swaps/interfaces/IAaveSwapper.sol
+3 −0		src/swaps/interfaces/IMilkman.sol
+2 −3		tests/ProtocolV3TestBase.t.sol
+42 −45		tests/swaps/AaveSwapperTest.t.sol
+7 −7		zksync/src/ProtocolV3TestBase.sol