aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-05-17 07:19:28 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-05-19 08:01:06 +0800
commitc8f65a1bf9c664b21ee21b08a3a91881d7f3dce1 (patch)
tree25d936fc6e4431f5384b7d41b37321b53cc02906
parentce177ae6f6fd5a4f23a85c97a44f2c1ca020ddff (diff)
downloaddexon-sol-tools-c8f65a1bf9c664b21ee21b08a3a91881d7f3dce1.tar
dexon-sol-tools-c8f65a1bf9c664b21ee21b08a3a91881d7f3dce1.tar.gz
dexon-sol-tools-c8f65a1bf9c664b21ee21b08a3a91881d7f3dce1.tar.bz2
dexon-sol-tools-c8f65a1bf9c664b21ee21b08a3a91881d7f3dce1.tar.lz
dexon-sol-tools-c8f65a1bf9c664b21ee21b08a3a91881d7f3dce1.tar.xz
dexon-sol-tools-c8f65a1bf9c664b21ee21b08a3a91881d7f3dce1.tar.zst
dexon-sol-tools-c8f65a1bf9c664b21ee21b08a3a91881d7f3dce1.zip
Updated order of settleMatchedOrders to align with settleOrder
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol4
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlement.sol6
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol6
3 files changed, 8 insertions, 8 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol
index 35d65c213..70b6b8ff8 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol
@@ -112,8 +112,8 @@ contract MixinMatchOrders is
settleMatchedOrders(
leftOrder,
rightOrder,
- matchedFillResults,
- takerAddress
+ takerAddress,
+ matchedFillResults
);
// Update exchange state
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlement.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlement.sol
index 7e324a5d2..6bd9edae5 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlement.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlement.sol
@@ -97,13 +97,13 @@ contract MixinSettlement is
/// @dev Settles matched order by transferring appropriate funds between order makers, taker, and fee recipient.
/// @param leftOrder First matched order.
/// @param rightOrder Second matched order.
- /// @param matchedFillResults Struct holding amounts to transfer between makers, taker, and fee recipients.
/// @param takerAddress Address that matched the orders. The taker receives the spread between orders as profit.
+ /// @param matchedFillResults Struct holding amounts to transfer between makers, taker, and fee recipients.
function settleMatchedOrders(
LibOrder.Order memory leftOrder,
LibOrder.Order memory rightOrder,
- MatchedFillResults memory matchedFillResults,
- address takerAddress
+ address takerAddress,
+ MatchedFillResults memory matchedFillResults
)
internal
{
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol
index d0de385db..b78718c0c 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol
@@ -38,13 +38,13 @@ contract MSettlement {
/// @dev Settles matched order by transferring appropriate funds between order makers, taker, and fee recipient.
/// @param leftOrder First matched order.
/// @param rightOrder Second matched order.
- /// @param matchedFillResults Struct holding amounts to transfer between makers, taker, and fee recipients.
/// @param takerAddress Address that matched the orders. The taker receives the spread between orders as profit.
+ /// @param matchedFillResults Struct holding amounts to transfer between makers, taker, and fee recipients.
function settleMatchedOrders(
LibOrder.Order memory leftOrder,
LibOrder.Order memory rightOrder,
- LibFillResults.MatchedFillResults memory matchedFillResults,
- address takerAddress
+ address takerAddress,
+ LibFillResults.MatchedFillResults memory matchedFillResults
)
internal;
}