aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-06-30 06:34:56 +0800
committerGitHub <noreply@github.com>2018-06-30 06:34:56 +0800
commit6a197a64e68dce4b1fd4e1d2f0e6ed46c279bd3e (patch)
treed57444961b42e129674865285422a21206643d93 /packages/contracts/test/exchange
parente3521c63887be7c9ef1792e0af5e2d15f5f9ed55 (diff)
parent1e4c3ed22b2409c0f9581cbd763bd1abc4ddcc33 (diff)
downloaddexon-sol-tools-6a197a64e68dce4b1fd4e1d2f0e6ed46c279bd3e.tar
dexon-sol-tools-6a197a64e68dce4b1fd4e1d2f0e6ed46c279bd3e.tar.gz
dexon-sol-tools-6a197a64e68dce4b1fd4e1d2f0e6ed46c279bd3e.tar.bz2
dexon-sol-tools-6a197a64e68dce4b1fd4e1d2f0e6ed46c279bd3e.tar.lz
dexon-sol-tools-6a197a64e68dce4b1fd4e1d2f0e6ed46c279bd3e.tar.xz
dexon-sol-tools-6a197a64e68dce4b1fd4e1d2f0e6ed46c279bd3e.tar.zst
dexon-sol-tools-6a197a64e68dce4b1fd4e1d2f0e6ed46c279bd3e.zip
Merge pull request #793 from 0xProject/feature/contracts/transferFromFallback
Optimize transferFrom (saves ~2000 gas /fill)
Diffstat (limited to 'packages/contracts/test/exchange')
-rw-r--r--packages/contracts/test/exchange/match_orders.ts24
1 files changed, 3 insertions, 21 deletions
diff --git a/packages/contracts/test/exchange/match_orders.ts b/packages/contracts/test/exchange/match_orders.ts
index e23ab9851..7bdb9c385 100644
--- a/packages/contracts/test/exchange/match_orders.ts
+++ b/packages/contracts/test/exchange/match_orders.ts
@@ -651,13 +651,7 @@ describe('matchOrders', () => {
});
// Match orders
return expectRevertReasonOrAlwaysFailingTransactionAsync(
- matchOrderTester.matchOrdersAndVerifyBalancesAsync(
- signedOrderLeft,
- signedOrderRight,
- takerAddress,
- erc20BalancesByOwner,
- erc721TokenIdsByOwner,
- ),
+ exchangeWrapper.matchOrdersAsync(signedOrderLeft, signedOrderRight, takerAddress),
RevertReason.NegativeSpreadRequired,
);
});
@@ -680,13 +674,7 @@ describe('matchOrders', () => {
});
// Match orders
return expectRevertReasonOrAlwaysFailingTransactionAsync(
- matchOrderTester.matchOrdersAndVerifyBalancesAsync(
- signedOrderLeft,
- signedOrderRight,
- takerAddress,
- erc20BalancesByOwner,
- erc721TokenIdsByOwner,
- ),
+ exchangeWrapper.matchOrdersAsync(signedOrderLeft, signedOrderRight, takerAddress),
// We are assuming assetData fields of the right order are the
// reverse of the left order, rather than checking equality. This
// saves a bunch of gas, but as a result if the assetData fields are
@@ -715,13 +703,7 @@ describe('matchOrders', () => {
});
// Match orders
return expectRevertReasonOrAlwaysFailingTransactionAsync(
- matchOrderTester.matchOrdersAndVerifyBalancesAsync(
- signedOrderLeft,
- signedOrderRight,
- takerAddress,
- erc20BalancesByOwner,
- erc721TokenIdsByOwner,
- ),
+ exchangeWrapper.matchOrdersAsync(signedOrderLeft, signedOrderRight, takerAddress),
RevertReason.InvalidOrderSignature,
);
});