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

Fix match orders test and add a validation TODO

Browse Source
This commit is contained in:
Leonid Logvinov
2018-07-03 16:25:13 +03:00
parent 61d9cdced0
commit b68d16820f
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/contract-wrappers/src/contract_wrappers/exchange_wrapper.ts
View File

@@ -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,

11
packages/contract-wrappers/test/exchange_wrapper_test.ts
View File

@@ -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);