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

Add batch fill method tests

Browse Source
This commit is contained in:
Amir Bandeali 2019-04-29 09:09:14 -07:00
parent dc4bfde76d
commit f1a78682aa
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,8 +151,12 @@ describe('Exchange transactions', () => {
taker2TransactionFactory = new TransactionFactory(taker2PrivateKey, exchangeInstance.address, chainId); taker2TransactionFactory = new TransactionFactory(taker2PrivateKey, exchangeInstance.address, chainId);
}); });
describe('executeTransaction', () => { describe('executeTransaction', () => {
describe('single order fills', () => { describe('fill methods', () => {
for (const fnName of exchangeConstants.SINGLE_FILL_FN_NAMES) { for (const fnName of [
...exchangeConstants.SINGLE_FILL_FN_NAMES,
...exchangeConstants.BATCH_FILL_FN_NAMES,
...exchangeConstants.MARKET_FILL_FN_NAMES,
]) {
it(`${fnName} should revert if signature is invalid and not called by signer`, async () => { it(`${fnName} should revert if signature is invalid and not called by signer`, async () => {
const orders = [await orderFactory.newSignedOrderAsync()]; const orders = [await orderFactory.newSignedOrderAsync()];
const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders); const data = exchangeDataEncoder.encodeOrdersToExchangeData(fnName, orders);
@ -236,7 +240,11 @@ describe('Exchange transactions', () => {
const abi = artifacts.Exchange.compilerOutput.abi; const abi = artifacts.Exchange.compilerOutput.abi;
const methodAbi = abi.filter(abiItem => (abiItem as MethodAbi).name === fnName)[0] as MethodAbi; const methodAbi = abi.filter(abiItem => (abiItem as MethodAbi).name === fnName)[0] as MethodAbi;
const abiEncoder = new AbiEncoder.Method(methodAbi); const abiEncoder = new AbiEncoder.Method(methodAbi);
const fillResults: FillResults = abiEncoder.decodeReturnValues(returnData).fillResults; const decodedReturnData = abiEncoder.decodeReturnValues(returnData);
const fillResults: FillResults =
decodedReturnData.fillResults === undefined
? decodedReturnData.totalFillResults
: decodedReturnData.fillResults;
expect(fillResults.makerAssetFilledAmount).to.be.bignumber.eq(order.makerAssetAmount); expect(fillResults.makerAssetFilledAmount).to.be.bignumber.eq(order.makerAssetAmount);
expect(fillResults.takerAssetFilledAmount).to.be.bignumber.eq(order.takerAssetAmount); expect(fillResults.takerAssetFilledAmount).to.be.bignumber.eq(order.takerAssetAmount);
expect(fillResults.makerFeePaid).to.be.bignumber.eq(order.makerFee); expect(fillResults.makerFeePaid).to.be.bignumber.eq(order.makerFee);
@ -309,7 +317,14 @@ describe('Exchange transactions', () => {
expect(fillLogArgs.takerFeePaid).to.bignumber.eq(orders[0].takerFee); expect(fillLogArgs.takerFeePaid).to.bignumber.eq(orders[0].takerFee);
expect(fillLogArgs.orderHash).to.eq(orderHashUtils.getOrderHashHex(orders[0])); expect(fillLogArgs.orderHash).to.eq(orderHashUtils.getOrderHashHex(orders[0]));
}); });
if (fnName !== ExchangeFunctionName.FillOrderNoThrow) { if (
[
ExchangeFunctionName.FillOrderNoThrow,
ExchangeFunctionName.BatchFillOrdersNoThrow,
ExchangeFunctionName.MarketBuyOrdersNoThrow,
ExchangeFunctionName.MarketSellOrdersNoThrow,
].indexOf(fnName) === -1
) {
it(`${fnName} should revert and rethrow error if the underlying function reverts`, async () => { it(`${fnName} should revert and rethrow error if the underlying function reverts`, async () => {
const order = await orderFactory.newSignedOrderAsync(); const order = await orderFactory.newSignedOrderAsync();
order.signature = constants.NULL_BYTES; order.signature = constants.NULL_BYTES;