diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts | 4 | ||||
| -rw-r--r-- | packages/contract-wrappers/test/exchange_wrapper_test.ts | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts index d381db1a4..0377c4021 100644 --- a/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts +++ b/packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts @@ -625,7 +625,9 @@ export class ExchangeWrapper extends ContractWrapper { await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper); assert.doesConformToSchema('orderTransactionOpts', orderTransactionOpts, orderTxOptsSchema, [txOptsSchema]); const normalizedTakerAddress = takerAddress.toLowerCase(); - + // TODO(logvinov): Check that: + // rightOrder.makerAssetData === leftOrder.takerAssetData; + // rightOrder.takerAssetData === leftOrder.makerAssetData; const exchangeInstance = await this._getExchangeContractAsync(); const txHash = await exchangeInstance.matchOrders.sendTransactionAsync( leftSignedOrder, diff --git a/packages/contract-wrappers/test/exchange_wrapper_test.ts b/packages/contract-wrappers/test/exchange_wrapper_test.ts index 227985794..615b4ab67 100644 --- a/packages/contract-wrappers/test/exchange_wrapper_test.ts +++ b/packages/contract-wrappers/test/exchange_wrapper_test.ts @@ -220,10 +220,17 @@ describe('ExchangeWrapper', () => { }); }); describe('#matchOrdersAsync', () => { - it.skip('should match two valid ordersr', async () => { + it('should match two valid ordersr', async () => { + const matchingSignedOrder = await fillScenarios.createFillableSignedOrderAsync( + takerAssetData, + makerAssetData, + makerAddress, + takerAddress, + fillableAmount, + ); txHash = await contractWrappers.exchange.matchOrdersAsync( signedOrder, - anotherSignedOrder, + matchingSignedOrder, takerAddress, ); await web3Wrapper.awaitTransactionSuccessAsync(txHash, constants.AWAIT_TRANSACTION_MINED_MS); |