aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-01-26 19:57:51 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-01-30 23:01:37 +0800
commitc02dfc4fb1bf39ceaaf80ec68fb8907a4a11e0df (patch)
tree989804625ca4019a837b272d49b5632820dac400
parent9d62e5fb6f0dc6dc451604f02fb4374a36fcac3c (diff)
downloaddexon-sol-tools-c02dfc4fb1bf39ceaaf80ec68fb8907a4a11e0df.tar
dexon-sol-tools-c02dfc4fb1bf39ceaaf80ec68fb8907a4a11e0df.tar.gz
dexon-sol-tools-c02dfc4fb1bf39ceaaf80ec68fb8907a4a11e0df.tar.bz2
dexon-sol-tools-c02dfc4fb1bf39ceaaf80ec68fb8907a4a11e0df.tar.lz
dexon-sol-tools-c02dfc4fb1bf39ceaaf80ec68fb8907a4a11e0df.tar.xz
dexon-sol-tools-c02dfc4fb1bf39ceaaf80ec68fb8907a4a11e0df.tar.zst
dexon-sol-tools-c02dfc4fb1bf39ceaaf80ec68fb8907a4a11e0df.zip
Fix tslint issues
-rw-r--r--packages/0x.js/src/contract_wrappers/exchange_wrapper.ts4
-rw-r--r--packages/0x.js/src/order_watcher/order_state_watcher.ts6
-rw-r--r--packages/utils/src/abi_decoder.ts3
3 files changed, 6 insertions, 7 deletions
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index 5672f0360..fceab851a 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -844,9 +844,9 @@ export class ExchangeWrapper extends ContractWrapper {
public throwLogErrorsAsErrors(logs: Array<LogWithDecodedArgs<DecodedLogArgs> | Web3.LogEntry>): void {
const errLog = _.find(logs, {
event: ExchangeEvents.LogError,
- }) as LogWithDecodedArgs<LogErrorContractEventArgs> | undefined;
+ });
if (!_.isUndefined(errLog)) {
- const logArgs = errLog.args;
+ const logArgs = (errLog as LogWithDecodedArgs<LogErrorContractEventArgs>).args;
const errCode = logArgs.errorId.toNumber();
const errMessage = this._exchangeContractErrCodesToMsg[errCode];
throw new Error(errMessage);
diff --git a/packages/0x.js/src/order_watcher/order_state_watcher.ts b/packages/0x.js/src/order_watcher/order_state_watcher.ts
index 446fab676..576be00c8 100644
--- a/packages/0x.js/src/order_watcher/order_state_watcher.ts
+++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts
@@ -223,12 +223,12 @@ export class OrderStateWatcher {
return;
}
const log = logIfExists as LogEvent; // At this moment we are sure that no error occured and log is defined.
- const maybeDecodedLog = this._abiDecoder.tryToDecodeLogOrNoop(log);
- const isLogDecoded = !_.isUndefined((maybeDecodedLog as LogWithDecodedArgs<any>).event);
+ const maybeDecodedLog = this._abiDecoder.tryToDecodeLogOrNoop<ContractEventArgs>(log);
+ const isLogDecoded = !_.isUndefined(((maybeDecodedLog as any) as LogWithDecodedArgs<ContractEventArgs>).event);
if (!isLogDecoded) {
return; // noop
}
- const decodedLog = maybeDecodedLog as LogWithDecodedArgs<ContractEventArgs>;
+ const decodedLog = (maybeDecodedLog as any) as LogWithDecodedArgs<ContractEventArgs>;
let makerToken: string;
let makerAddress: string;
switch (decodedLog.event) {
diff --git a/packages/utils/src/abi_decoder.ts b/packages/utils/src/abi_decoder.ts
index d6584d44d..f96ee2edb 100644
--- a/packages/utils/src/abi_decoder.ts
+++ b/packages/utils/src/abi_decoder.ts
@@ -3,7 +3,6 @@ import * as _ from 'lodash';
import * as Web3 from 'web3';
import * as SolidityCoder from 'web3/lib/solidity/coder';
-// tslint:disable-next-line:no-unused-variable
import { BigNumber } from './configured_bignumber';
export class AbiDecoder {
@@ -39,7 +38,7 @@ export class AbiDecoder {
_.map(event.inputs, (param: Web3.EventParameter) => {
// Indexed parameters are stored in topics. Non-indexed ones in decodedData
- let value = param.indexed ? log.topics[topicsIndex++] : decodedData[dataIndex++];
+ let value: BigNumber | string = param.indexed ? log.topics[topicsIndex++] : decodedData[dataIndex++];
if (param.type === SolidityTypes.Address) {
value = AbiDecoder._padZeros(new BigNumber(value).toString(16));
} else if (