test(halmos): part

defi-wonderland · Jul 15, 2024 · 8cde0c0 · 8cde0c0
1 parent d12abd4
commit 8cde0c0
Show file tree

Hide file tree

Showing 9 changed files with 478 additions and 9 deletions.
diff --git a/test/invariants/fuzz/external/BToken.sol b/test/invariants/fuzz/external/BToken.sol
@@ -1,6 +1,6 @@
 pragma solidity 0.8.23;
 
-import {EchidnaTest} from '../../AdvancedTestsUtils.sol';
+import {EchidnaTest} from '../../helpers/AdvancedTestsUtils.sol';
 import {CryticERC20ExternalBasicProperties} from
   '@crytic/properties/contracts/ERC20/external/properties/ERC20ExternalBasicProperties.sol';
 import {ITokenMock} from '@crytic/properties/contracts/ERC20/external/util/ITokenMock.sol';

diff --git a/test/invariants/fuzz/external/Protocol.t.sol b/test/invariants/fuzz/external/Protocol.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.23;
 
-import {EchidnaTest, FuzzERC20} from '../../AdvancedTestsUtils.sol';
+import {EchidnaTest, FuzzERC20} from '../../helpers/AdvancedTestsUtils.sol';
 
 import {MockSettler} from './MockSettler.sol';
 import {BCoWFactory, BCoWPool, IBPool} from 'contracts/BCoWFactory.sol';

diff --git a/test/invariants/fuzz/internal/BMath.t.sol b/test/invariants/fuzz/internal/BMath.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.23;
 
-import {EchidnaTest} from '../../AdvancedTestsUtils.sol';
+import {EchidnaTest} from '../../helpers/AdvancedTestsUtils.sol';
 
 import {BMath} from 'contracts/BMath.sol';
 

diff --git a/test/invariants/fuzz/internal/BNum.t.sol b/test/invariants/fuzz/internal/BNum.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.23;
 
-import {EchidnaTest} from '../../AdvancedTestsUtils.sol';
+import {EchidnaTest} from '../../helpers/AdvancedTestsUtils.sol';
 
 import {BNum} from 'contracts/BNum.sol';
 

diff --git a/test/invariants/AdvancedTestsUtils.sol → ...invariants/helpers/AdvancedTestsUtils.sol b/test/invariants/AdvancedTestsUtils.sol → ...invariants/helpers/AdvancedTestsUtils.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.23;
 
+import {Test} from 'forge-std/Test.sol';
 import {MockERC20} from 'forge-std/mocks/MockERC20.sol';
 import {SymTest} from 'halmos-cheatcodes/src/SymTest.sol';
 
@@ -60,4 +61,4 @@ contract EchidnaTest is AgentsHandler {
   }
 }
 
-contract HalmosTest is SymTest {}
+contract HalmosTest is SymTest, Test {}
diff --git a/test/invariants/helpers/MockSettler.sol b/test/invariants/helpers/MockSettler.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.23;
+
+import {GPv2Interaction, GPv2Trade, IERC20, ISettlement} from 'interfaces/ISettlement.sol';
+
+contract MockSettler is ISettlement {
+  function domainSeparator() external view override returns (bytes32) {
+    return bytes32(hex'1234');
+  }
+
+  function vaultRelayer() external view override returns (address) {
+    return address(123);
+  }
+
+  function settle(
+    IERC20[] calldata tokens,
+    uint256[] calldata clearingPrices,
+    GPv2Trade.Data[] calldata trades,
+    GPv2Interaction.Data[][3] calldata interactions
+  ) external {}
+}
diff --git a/test/invariants/symbolic/BMath.t.sol b/test/invariants/symbolic/BMath.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.23;
 
-import {HalmosTest} from '../AdvancedTestsUtils.sol';
+import {HalmosTest} from '../helpers/AdvancedTestsUtils.sol';
 import {BMath} from 'contracts/BMath.sol';
 
 contract SymbolicBMath is BMath, HalmosTest {

diff --git a/test/invariants/symbolic/BNum.t.sol b/test/invariants/symbolic/BNum.t.sol
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.23;
 
-import {HalmosTest} from '../AdvancedTestsUtils.sol';
+import {HalmosTest} from '../helpers/AdvancedTestsUtils.sol';
 import {BNum} from 'contracts/BNum.sol';
-import {Test} from 'forge-std/Test.sol';
 
-contract SymbolicBNum is BNum, Test, HalmosTest {
+contract SymbolicBNum is BNum, HalmosTest {
   /////////////////////////////////////////////////////////////////////
   //                           Bnum::btoi                            //
   /////////////////////////////////////////////////////////////////////