Fix failing tests (#410)

* Fix failing tests

* Fix invariant tests taking too long

* Fix more failing tests

Author: matejos

packages/contracts/evm-contracts/foundry.toml

@@ -32,4 +32,5 @@ evm_version = 'berlin' # the evm version (by hardfork name)
 #block_timestamp = 0                                           # the value of `block.timestamp` in tests
 #block_difficulty = 0                                          # the value of `block.difficulty` in tests
 [invariant]
-fail_on_revert = true
+fail_on_revert = true
+depth = 15

packages/contracts/evm-contracts/test/OrderbookDex.t.sol

@@ -152,7 +152,7 @@ contract OrderbookDexTest is CTest, ERC1155Holder {
     function testFuzz_fillOrdersExactEth_transfersCorrectly(uint256 price) public {
         uint256 ordersCount = 5;
         vm.assume(price / ordersCount > 0);
-        vm.assume(price < type(uint256).max / ordersCount / 10000);
+        vm.assume(price < type(uint256).max / ordersCount / orderCreationFee);
         uint256[] memory orderIds = new uint256[](ordersCount);
         address payable[] memory sellers = new address payable[](ordersCount);
         uint256[] memory assetIds = new uint256[](ordersCount);
@@ -241,7 +241,7 @@ contract OrderbookDexTest is CTest, ERC1155Holder {
     function testFuzz_fillOrdersExactAsset_transfersCorrectly(uint256 price) public {
         uint256 ordersCount = 5;
         vm.assume(price / ordersCount > 0);
-        vm.assume(price < type(uint256).max / ordersCount / 10000);
+        vm.assume(price < type(uint256).max / ordersCount / orderCreationFee);
         uint256[] memory orderIds = new uint256[](ordersCount);
         address payable[] memory sellers = new address payable[](ordersCount);
         uint256[] memory assetIds = new uint256[](ordersCount);
@@ -333,7 +333,7 @@ contract OrderbookDexTest is CTest, ERC1155Holder {
         uint256 assetAmountToBuy
     ) public {
         vm.assume(assetAmount > 0 && pricePerAsset > 1);
-        vm.assume(assetAmount < type(uint256).max / pricePerAsset / 10000);
+        vm.assume(assetAmount < type(uint256).max / pricePerAsset / orderCreationFee);
         vm.assume(pricePerAsset < type(uint256).max / assetAmount);
         vm.assume(assetAmountToBuy < assetAmount);
 
@@ -383,7 +383,7 @@ contract OrderbookDexTest is CTest, ERC1155Holder {
         uint256 assetAmountToBuy
     ) public {
         vm.assume(assetAmount > 0 && pricePerAsset > 0);
-        vm.assume(assetAmount < type(uint256).max / pricePerAsset / 10000);
+        vm.assume(assetAmount < type(uint256).max / pricePerAsset / orderCreationFee);
         vm.assume(pricePerAsset < type(uint256).max / assetAmount);
         vm.assume(assetAmountToBuy < assetAmount);
 
@@ -433,7 +433,7 @@ contract OrderbookDexTest is CTest, ERC1155Holder {
     ) public {
         uint256 multiplier = 3;
         vm.assume(assetAmount > 0 && pricePerAsset > 0);
-        vm.assume(assetAmount < type(uint256).max / pricePerAsset / multiplier / 10000);
+        vm.assume(assetAmount < type(uint256).max / pricePerAsset / multiplier / orderCreationFee);
         vm.assume(pricePerAsset < type(uint256).max / assetAmount / multiplier);
 
         vm.deal(alice, assetAmount * pricePerAsset * multiplier);
@@ -462,7 +462,7 @@ contract OrderbookDexTest is CTest, ERC1155Holder {
     ) public {
         uint256 multiplier = 3;
         vm.assume(assetAmount > 0 && pricePerAsset > 0);
-        vm.assume(assetAmount < type(uint256).max / pricePerAsset / multiplier / 10000);
+        vm.assume(assetAmount < type(uint256).max / pricePerAsset / multiplier / orderCreationFee);
         vm.assume(pricePerAsset < type(uint256).max / assetAmount / multiplier);
 
         vm.deal(alice, assetAmount * pricePerAsset * multiplier);

packages/contracts/evm-contracts/test/OrderbookDexInvariant.t.sol

@@ -15,7 +15,7 @@ import {IOrderbookDex} from "../contracts/orderbook/IOrderbookDex.sol";
 import {OrderbookDex} from "../contracts/orderbook/OrderbookDex.sol";
 import {OrderbookDexProxy} from "../contracts/Proxy/OrderbookDexProxy.sol";
 
-contract AssetHandler is CTest {
+contract AssetHandler is CTest, ERC1155Holder {
     CheatCodes vm = CheatCodes(HEVM_ADDRESS);
     IOrderbookDex public dex;
     IInverseAppProjected1155 asset;