diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | 2 | ||||
| -rw-r--r-- | packages/0x.js/test/subscription_test.ts | 18 | ||||
| -rw-r--r-- | packages/0x.js/tslint.json | 5 |
3 files changed, 15 insertions, 10 deletions
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts index fe0c5bc00..b4bf24846 100644 --- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts @@ -807,7 +807,7 @@ export class ExchangeWrapper extends ContractWrapper { if (!_.isUndefined(errLog)) { const logArgs = errLog.args; const errCode = logArgs.errorId.toNumber(); - const errMessage = this._exchangeContractErrCodesToMsg[errCode]; + const errMessage: ExchangeContractErrs = this._exchangeContractErrCodesToMsg[errCode]; throw new Error(errMessage); } } diff --git a/packages/0x.js/test/subscription_test.ts b/packages/0x.js/test/subscription_test.ts index 985fdc1d6..f69ae0b13 100644 --- a/packages/0x.js/test/subscription_test.ts +++ b/packages/0x.js/test/subscription_test.ts @@ -13,7 +13,7 @@ import { Token, ApprovalContractEventArgs, TokenEvents, - LogEvent, + DecodedLogEvent, } from '../src'; import {BlockchainLifecycle} from './utils/blockchain_lifecycle'; import {TokenUtils} from './utils/token_utils'; @@ -64,15 +64,15 @@ describe('SubscriptionTest', () => { }); it('Should receive the Error when an error occurs', (done: DoneCallback) => { (async () => { - const callback = (err: Error, logEvent: LogEvent<ApprovalContractEventArgs>) => { + const callback = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => { expect(err).to.not.be.null(); expect(logEvent).to.be.undefined(); done(); }; stubs = [ Sinon.stub((zeroEx as any)._web3Wrapper, 'getBlockAsync') - .throws("JSON RPC error") - ] + .throws('JSON RPC error'), + ]; zeroEx.token.subscribe( tokenAddress, TokenEvents.Approval, indexFilterValues, callback); await zeroEx.token.setAllowanceAsync(tokenAddress, coinbase, addressWithoutFunds, allowanceAmount); @@ -80,16 +80,16 @@ describe('SubscriptionTest', () => { }); it('Should allow unsubscribeAll to be called successfully after an error', (done: DoneCallback) => { (async () => { - const callback = (err: Error, logEvent: LogEvent<ApprovalContractEventArgs>) => { }; + const callback = (err: Error, logEvent: DecodedLogEvent<ApprovalContractEventArgs>) => _.noop; zeroEx.token.subscribe( tokenAddress, TokenEvents.Approval, indexFilterValues, callback); stubs = [ Sinon.stub((zeroEx as any)._web3Wrapper, 'getBlockAsync') - .throws("JSON RPC error") - ] + .throws('JSON RPC error'), + ]; zeroEx.token.unsubscribeAll(); done(); })().catch(done); }); - }) - })
\ No newline at end of file + }); +}); diff --git a/packages/0x.js/tslint.json b/packages/0x.js/tslint.json new file mode 100644 index 000000000..5842a872a --- /dev/null +++ b/packages/0x.js/tslint.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "tslint-config-0xproject" + ] +} |