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

@0x:contracts-exchange Updated MixinMatchOrders to use library RichErrors

Browse Source
This commit is contained in:
James Towle 2019-07-11 16:02:45 -05:00 committed by Amir Bandeali
parent 015c35f2b2
commit 4de1d69282
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contracts/exchange/contracts/src/MixinMatchOrders.sol
View File

@ -14,20 +14,21 @@
pragma solidity ^0.5.9; pragma solidity ^0.5.9;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-utils/contracts/src/LibRichErrors.sol";
import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol"; import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";
import "@0x/contracts-utils/contracts/src/RichErrors.sol"; import "@0x/contracts-utils/contracts/src/RichErrors.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol"; import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "./interfaces/IAssetProxyDispatcher.sol"; import "./interfaces/IAssetProxyDispatcher.sol";
import "./MixinExchangeCore.sol"; import "./interfaces/IExchangeRichErrors.sol";
import "./interfaces/IMatchOrders.sol"; import "./interfaces/IMatchOrders.sol";
import "./interfaces/ITransactions.sol"; import "./interfaces/ITransactions.sol";
import "./MixinExchangeRichErrors.sol"; import "./LibExchangeRichErrors.sol";
import "./MixinExchangeCore.sol";
contract MixinMatchOrders is contract MixinMatchOrders is
MixinExchangeRichErrors,
MixinExchangeCore, MixinExchangeCore,
IMatchOrders IMatchOrders
{ {
@ -255,7 +256,7 @@ contract MixinMatchOrders is
// These equations can be combined to get the following: // These equations can be combined to get the following:
if (_safeMul(leftOrder.makerAssetAmount, rightOrder.makerAssetAmount) < if (_safeMul(leftOrder.makerAssetAmount, rightOrder.makerAssetAmount) <
_safeMul(leftOrder.takerAssetAmount, rightOrder.takerAssetAmount)) { _safeMul(leftOrder.takerAssetAmount, rightOrder.takerAssetAmount)) {
_rrevert(NegativeSpreadError( LibRichErrors._rrevert(LibExchangeRichErrors.NegativeSpreadError(
getOrderHash(leftOrder), getOrderHash(leftOrder),
getOrderHash(rightOrder) getOrderHash(rightOrder)
)); ));