aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
diff options
context:
space:
mode:
authorRemco Bloemen <remco@wicked.ventures>2018-08-25 07:13:17 +0800
committerRemco Bloemen <remco@wicked.ventures>2018-08-25 07:46:24 +0800
commite21599285941a092a6c6f2dbf58f14f467dcca85 (patch)
tree39af43f14d83cbcdf47e2dceb274f7996296e4a9 /packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
parente6f5cac87887709b5a3baaec059005301723f0a5 (diff)
downloaddexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.gz
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.bz2
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.lz
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.xz
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.zst
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.zip
Fix mixin api
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol14
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
index 5a5b0376e..c860640c4 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
@@ -70,10 +70,10 @@ contract MixinMatchOrders is
leftSignature
);
assertFillableOrder(
- righttOrder,
- righttOrderInfo,
+ rightOrder,
+ rightOrderInfo,
takerAddress,
- leftSignature
+ rightSignature
);
assertValidMatch(leftOrder, rightOrder);
@@ -88,17 +88,17 @@ contract MixinMatchOrders is
// Validate fill contexts
assertValidFill(
leftOrder,
+ leftOrderInfo,
matchedFillResults.left.takerAssetFilledAmount,
matchedFillResults.left.takerAssetFilledAmount,
- matchedFillResults.left.makerAssetFilledAmount,
- leftSignature
+ matchedFillResults.left.makerAssetFilledAmount
);
assertValidFill(
rightOrder,
+ rightOrderInfo,
matchedFillResults.right.takerAssetFilledAmount,
matchedFillResults.right.takerAssetFilledAmount,
- matchedFillResults.right.makerAssetFilledAmount,
- rightSignature
+ matchedFillResults.right.makerAssetFilledAmount
);
// Update exchange state