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

Add names to return values and fix breaking transactions tests

Browse Source
This commit is contained in:
Amir Bandeali
2019-05-26 11:35:18 -07:00
parent 564dbea126
commit 589b791cd7
3 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/exchange/test/transactions.ts
View File

@@ -286,11 +286,13 @@ describe('Exchange transactions', () => {
const abi = artifacts.Exchange.compilerOutput.abi;
const methodAbi = abi.filter(abiItem => (abiItem as MethodAbi).name === fnName)[0] as MethodAbi;
const abiEncoder = new AbiEncoder.Method(methodAbi);
const decodedReturnData = abiEncoder.decodeReturnValues(returnData);
const fillResults: FillResults =
decodedReturnData.fillResults === undefined
? decodedReturnData.totalFillResults
const fillResults =
exchangeConstants.BATCH_FILL_FN_NAMES.indexOf(fnName) !== -1
? decodedReturnData.fillResults[0]
: decodedReturnData.fillResults;
expect(fillResults.makerAssetFilledAmount).to.be.bignumber.eq(order.makerAssetAmount);
expect(fillResults.takerAssetFilledAmount).to.be.bignumber.eq(order.takerAssetAmount);
expect(fillResults.makerFeePaid).to.be.bignumber.eq(order.makerFee);