crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@0x/contracts-exchange: Update settlement test simulators to match settlement optimizations in the Exchange.

Browse Source
This commit is contained in:
Lawrence Forman 2019-05-29 22:00:39 -04:00 committed by Amir Bandeali
parent 2f464ee8f0
commit 95e7999e45
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/exchange/test/utils/fill_order_simulator.ts
View File

@ -81,7 +81,7 @@ export class FillOrderSimulator {
TransferType.Trade, TransferType.Trade,
); );
// Maker fee -> fee recipient // Maker fee -> fee recipient
if (makerFeePaid.isGreaterThan(0)) { if (order.makerAddress !== order.feeRecipientAddress) {
await this._transferSimulator.transferFromAsync( await this._transferSimulator.transferFromAsync(
order.makerFeeAssetData, order.makerFeeAssetData,
order.makerAddress, order.makerAddress,
@ -101,7 +101,7 @@ export class FillOrderSimulator {
TransferType.Trade, TransferType.Trade,
); );
// Taker fee -> fee recipient // Taker fee -> fee recipient
if (takerFeePaid.isGreaterThan(0)) { if (takerAddress !== order.feeRecipientAddress) {
await this._transferSimulator.transferFromAsync( await this._transferSimulator.transferFromAsync(
order.takerFeeAssetData, order.takerFeeAssetData,
takerAddress, takerAddress,

36
contracts/exchange/test/utils/match_order_tester.ts
View File

@ -267,14 +267,16 @@ function simulateMatchOrders(
orders.rightOrder.makerAssetData, orders.rightOrder.makerAssetData,
matchResults, matchResults,
); );
// Left maker fees if (orders.leftOrder.makerAddress !== orders.leftOrder.feeRecipientAddress) {
transferAsset( // Left maker fees
orders.leftOrder.makerAddress, transferAsset(
orders.leftOrder.feeRecipientAddress, orders.leftOrder.makerAddress,
transferAmounts.leftMakerFeeAssetPaidByLeftMakerAmount, orders.leftOrder.feeRecipientAddress,
orders.leftOrder.makerFeeAssetData, transferAmounts.leftMakerFeeAssetPaidByLeftMakerAmount,
matchResults, orders.leftOrder.makerFeeAssetData,
); matchResults,
);
}
// Left maker asset -> right maker // Left maker asset -> right maker
transferAsset( transferAsset(
orders.leftOrder.makerAddress, orders.leftOrder.makerAddress,
@ -283,14 +285,16 @@ function simulateMatchOrders(
orders.leftOrder.makerAssetData, orders.leftOrder.makerAssetData,
matchResults, matchResults,
); );
// Right maker fees if (orders.rightOrder.makerAddress !== orders.rightOrder.feeRecipientAddress) {
transferAsset( // Right maker fees
orders.rightOrder.makerAddress, transferAsset(
orders.rightOrder.feeRecipientAddress, orders.rightOrder.makerAddress,
transferAmounts.rightMakerFeeAssetPaidByRightMakerAmount, orders.rightOrder.feeRecipientAddress,
orders.rightOrder.makerFeeAssetData, transferAmounts.rightMakerFeeAssetPaidByRightMakerAmount,
matchResults, orders.rightOrder.makerFeeAssetData,
); matchResults,
);
}
// Left taker profit // Left taker profit
transferAsset( transferAsset(
orders.leftOrder.makerAddress, orders.leftOrder.makerAddress,