diff options
author | Fabio Berger <me@fabioberger.com> | 2017-12-20 01:02:50 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-12-20 01:02:50 +0800 |
commit | 06bd5a9b038c40d102db2cc8095bc08d79a547a8 (patch) | |
tree | 52508b9885b13321c80d0b2dd5a6ade9f9a11d63 /packages/0x.js/test/exchange_wrapper_test.ts | |
parent | e38c7ff0760c766b92a7d19261a3a6f480adf567 (diff) | |
parent | 1316a2dd2a8971771f750d8a7f457212daad520b (diff) | |
download | dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.gz dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.bz2 dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.lz dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.xz dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.zst dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.zip |
Merge branch 'development' into refactor/website
* development:
Introduce an identityCommandBuilder
Define types for methodID
Define types for ethereumjs-abi
Install types for yargs
Fix comments
Fix linter issues
Fix linter error
Rename SubscriptionOpts to BlockRange
Diffstat (limited to 'packages/0x.js/test/exchange_wrapper_test.ts')
-rw-r--r-- | packages/0x.js/test/exchange_wrapper_test.ts | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/0x.js/test/exchange_wrapper_test.ts b/packages/0x.js/test/exchange_wrapper_test.ts index 51b511dbf..9c55069da 100644 --- a/packages/0x.js/test/exchange_wrapper_test.ts +++ b/packages/0x.js/test/exchange_wrapper_test.ts @@ -5,6 +5,7 @@ import 'mocha'; import * as Web3 from 'web3'; import { + BlockRange, DecodedLogEvent, ExchangeContractErrs, ExchangeEvents, @@ -13,7 +14,6 @@ import { OrderCancellationRequest, OrderFillRequest, SignedOrder, - SubscriptionOpts, Token, ZeroEx, } from '../src'; @@ -760,7 +760,7 @@ describe('ExchangeWrapper', () => { let takerAddress: string; const fillableAmount = new BigNumber(5); const shouldThrowOnInsufficientBalanceOrAllowance = true; - const subscriptionOpts: SubscriptionOpts = { + const blockRange: BlockRange = { fromBlock: 0, toBlock: BlockParamLiteral.Latest, }; @@ -781,7 +781,7 @@ describe('ExchangeWrapper', () => { await zeroEx.awaitTransactionMinedAsync(txHash); const eventName = ExchangeEvents.LogFill; const indexFilterValues = {}; - const logs = await zeroEx.exchange.getLogsAsync(eventName, subscriptionOpts, indexFilterValues); + const logs = await zeroEx.exchange.getLogsAsync(eventName, blockRange, indexFilterValues); expect(logs).to.have.length(1); expect(logs[0].event).to.be.equal(eventName); }); @@ -795,7 +795,7 @@ describe('ExchangeWrapper', () => { await zeroEx.awaitTransactionMinedAsync(txHash); const differentEventName = ExchangeEvents.LogCancel; const indexFilterValues = {}; - const logs = await zeroEx.exchange.getLogsAsync(differentEventName, subscriptionOpts, indexFilterValues); + const logs = await zeroEx.exchange.getLogsAsync(differentEventName, blockRange, indexFilterValues); expect(logs).to.have.length(0); }); it('should only get the logs with the correct indexed fields', async () => { @@ -821,7 +821,7 @@ describe('ExchangeWrapper', () => { maker: differentMakerAddress, }; const logs = await zeroEx.exchange.getLogsAsync<LogFillContractEventArgs>( - eventName, subscriptionOpts, indexFilterValues, + eventName, blockRange, indexFilterValues, ); expect(logs).to.have.length(1); const args = logs[0].args; |