Fix tslint issues

This commit is contained in:
Leonid Logvinov 2018-01-26 12:57:51 +01:00
parent 9d62e5fb6f
commit c02dfc4fb1
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
3 changed files with 6 additions and 7 deletions

View File

@ -844,9 +844,9 @@ export class ExchangeWrapper extends ContractWrapper {
public throwLogErrorsAsErrors(logs: Array<LogWithDecodedArgs<DecodedLogArgs> | Web3.LogEntry>): void { public throwLogErrorsAsErrors(logs: Array<LogWithDecodedArgs<DecodedLogArgs> | Web3.LogEntry>): void {
const errLog = _.find(logs, { const errLog = _.find(logs, {
event: ExchangeEvents.LogError, event: ExchangeEvents.LogError,
}) as LogWithDecodedArgs<LogErrorContractEventArgs> | undefined; });
if (!_.isUndefined(errLog)) { if (!_.isUndefined(errLog)) {
const logArgs = errLog.args; const logArgs = (errLog as LogWithDecodedArgs<LogErrorContractEventArgs>).args;
const errCode = logArgs.errorId.toNumber(); const errCode = logArgs.errorId.toNumber();
const errMessage = this._exchangeContractErrCodesToMsg[errCode]; const errMessage = this._exchangeContractErrCodesToMsg[errCode];
throw new Error(errMessage); throw new Error(errMessage);

View File

@ -223,12 +223,12 @@ export class OrderStateWatcher {
return; return;
} }
const log = logIfExists as LogEvent; // At this moment we are sure that no error occured and log is defined. 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 maybeDecodedLog = this._abiDecoder.tryToDecodeLogOrNoop<ContractEventArgs>(log);
const isLogDecoded = !_.isUndefined((maybeDecodedLog as LogWithDecodedArgs<any>).event); const isLogDecoded = !_.isUndefined(((maybeDecodedLog as any) as LogWithDecodedArgs<ContractEventArgs>).event);
if (!isLogDecoded) { if (!isLogDecoded) {
return; // noop return; // noop
} }
const decodedLog = maybeDecodedLog as LogWithDecodedArgs<ContractEventArgs>; const decodedLog = (maybeDecodedLog as any) as LogWithDecodedArgs<ContractEventArgs>;
let makerToken: string; let makerToken: string;
let makerAddress: string; let makerAddress: string;
switch (decodedLog.event) { switch (decodedLog.event) {

View File

@ -3,7 +3,6 @@ import * as _ from 'lodash';
import * as Web3 from 'web3'; import * as Web3 from 'web3';
import * as SolidityCoder from 'web3/lib/solidity/coder'; import * as SolidityCoder from 'web3/lib/solidity/coder';
// tslint:disable-next-line:no-unused-variable
import { BigNumber } from './configured_bignumber'; import { BigNumber } from './configured_bignumber';
export class AbiDecoder { export class AbiDecoder {
@ -39,7 +38,7 @@ export class AbiDecoder {
_.map(event.inputs, (param: Web3.EventParameter) => { _.map(event.inputs, (param: Web3.EventParameter) => {
// Indexed parameters are stored in topics. Non-indexed ones in decodedData // 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) { if (param.type === SolidityTypes.Address) {
value = AbiDecoder._padZeros(new BigNumber(value).toString(16)); value = AbiDecoder._padZeros(new BigNumber(value).toString(16));
} else if ( } else if (