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

Updated order of settleMatchedOrders to align with settleOrder

Browse Source
This commit is contained in:
Greg Hysen
2018-05-16 16:19:28 -07:00
parent ce177ae6f6
commit c8f65a1bf9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol
View File

@@ -112,8 +112,8 @@ contract MixinMatchOrders is
settleMatchedOrders(
leftOrder,
rightOrder,
matchedFillResults,
takerAddress
takerAddress,
matchedFillResults
);
// Update exchange state

6
packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlement.sol
View File

@@ -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
{

6
packages/contracts/src/contracts/current/protocol/Exchange/mixins/MSettlement.sol
View File

@@ -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;
}