aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-06-21 08:27:45 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-06-21 08:27:45 +0800
commit6d5b16725d364a632f6838129086e915fcc0b338 (patch)
treee049cc08dd86e1ab14f21f70b2483a542b2a45d6 /packages/contracts/src
parent8ee6e26608a832e48f235fbcb948721afcee648f (diff)
downloaddexon-sol-tools-6d5b16725d364a632f6838129086e915fcc0b338.tar
dexon-sol-tools-6d5b16725d364a632f6838129086e915fcc0b338.tar.gz
dexon-sol-tools-6d5b16725d364a632f6838129086e915fcc0b338.tar.bz2
dexon-sol-tools-6d5b16725d364a632f6838129086e915fcc0b338.tar.lz
dexon-sol-tools-6d5b16725d364a632f6838129086e915fcc0b338.tar.xz
dexon-sol-tools-6d5b16725d364a632f6838129086e915fcc0b338.tar.zst
dexon-sol-tools-6d5b16725d364a632f6838129086e915fcc0b338.zip
Set settleOrder and settleMatchedOrders to private
Diffstat (limited to 'packages/contracts/src')
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol2
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinMatchOrders.sol2
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/mixins/MExchangeCore.sol11
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/mixins/MMatchOrders.sol12
4 files changed, 2 insertions, 25 deletions
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;
}