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

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

Browse Source
This commit is contained in:
James Towle
2019-07-11 15:39:48 -05:00
committed by Amir Bandeali
parent 3d95817dbe
commit 5a491b2624
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/exchange/contracts/src/MixinWrapperFunctions.sol
View File

@@ -20,20 +20,20 @@ pragma solidity ^0.5.9;
pragma experimental ABIEncoderV2;
import "@0x/contracts-utils/contracts/src/ReentrancyGuard.sol";
import "@0x/contracts-utils/contracts/src/RichErrors.sol";
import "@0x/contracts-utils/contracts/src/LibRichErrors.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "./interfaces/IExchangeCore.sol";
import "./interfaces/IExchangeRichErrors.sol";
import "./interfaces/IWrapperFunctions.sol";
import "./MixinExchangeRichErrors.sol";
import "./LibExchangeRichErrors.sol";
import "./MixinExchangeCore.sol";
contract MixinWrapperFunctions is
IWrapperFunctions,
MixinExchangeRichErrors,
MixinExchangeCore
{
/// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled.
@@ -445,7 +445,9 @@ contract MixinWrapperFunctions is
signature
);
if (fillResults.takerAssetFilledAmount != takerAssetFillAmount) {
_rrevert(IncompleteFillError(getOrderInfo(order).orderHash));
LibRichErrors._rrevert(LibExchangeRichErrors.IncompleteFillError(
getOrderInfo(order).orderHash
));
}
return fillResults;
}

2
contracts/exchange/test/wrapper.ts
View File

@@ -36,7 +36,7 @@ const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
// tslint:disable:no-unnecessary-type-assertion
describe('Exchange wrappers', () => {
describe.only('Exchange wrappers', () => {
let chainId: number;
let makerAddress: string;
let owner: string;