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
Download Patch File Download Diff File Expand all files Collapse all files

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

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