From 6d5b16725d364a632f6838129086e915fcc0b338 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Wed, 20 Jun 2018 17:27:45 -0700 Subject: Set settleOrder and settleMatchedOrders to private --- .../current/protocol/Exchange/MixinExchangeCore.sol | 2 +- .../contracts/current/protocol/Exchange/MixinMatchOrders.sol | 2 +- .../current/protocol/Exchange/mixins/MExchangeCore.sol | 11 ----------- .../current/protocol/Exchange/mixins/MMatchOrders.sol | 12 ------------ 4 files changed, 2 insertions(+), 25 deletions(-) (limited to 'packages/contracts/src') diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol index 2e6c86d48..8539342b7 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol @@ -403,7 +403,7 @@ contract MixinExchangeCore is address takerAddress, LibFillResults.FillResults memory fillResults ) - internal + private { uint8 makerAssetProxyId = uint8(popLastByte(order.makerAssetData)); uint8 takerAssetProxyId = uint8(popLastByte(order.takerAssetData)); diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol index 945153731..82325a29f 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol @@ -240,7 +240,7 @@ contract MixinMatchOrders is address takerAddress, LibFillResults.MatchedFillResults memory matchedFillResults ) - internal + private { uint8 leftMakerAssetProxyId = uint8(popLastByte(leftOrder.makerAssetData)); uint8 rightMakerAssetProxyId = uint8(popLastByte(rightOrder.makerAssetData)); diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol index c752d928c..1737f5baf 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol @@ -122,15 +122,4 @@ contract MExchangeCore is pure returns (LibFillResults.FillResults memory fillResults); - /// @dev Settles an order by transferring assets between counterparties. - /// @param order Order struct containing order specifications. - /// @param takerAddress Address selling takerAsset and buying makerAsset. - /// @param fillResults Amounts to be filled and fees paid by maker and taker. - function settleOrder( - LibOrder.Order memory order, - address takerAddress, - LibFillResults.FillResults memory fillResults - ) - internal; - } diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MMatchOrders.sol b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MMatchOrders.sol index 6b4cff972..abe7c3596 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MMatchOrders.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/mixins/MMatchOrders.sol @@ -55,16 +55,4 @@ contract MMatchOrders is pure returns (LibFillResults.MatchedFillResults memory matchedFillResults); - /// @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 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, - address takerAddress, - LibFillResults.MatchedFillResults memory matchedFillResults - ) - internal; } -- cgit v1.2.3