diff options
author | Greg Hysen <greg.hysen@gmail.com> | 2018-12-24 12:50:02 +0800 |
---|---|---|
committer | Greg Hysen <greg.hysen@gmail.com> | 2019-01-15 02:49:44 +0800 |
commit | 86caa4a0bb82e3ba7d362cca9b75565bf8944952 (patch) | |
tree | 1cddd589130d6844dcb6824d1b4bcf588a8719b5 /packages/utils/src/abi_encoder/evm_data_types/tuple.ts | |
parent | 6d832deb62cdef38c5fa69169986ef00dbc6e1eb (diff) | |
download | dexon-sol-tools-86caa4a0bb82e3ba7d362cca9b75565bf8944952.tar dexon-sol-tools-86caa4a0bb82e3ba7d362cca9b75565bf8944952.tar.gz dexon-sol-tools-86caa4a0bb82e3ba7d362cca9b75565bf8944952.tar.bz2 dexon-sol-tools-86caa4a0bb82e3ba7d362cca9b75565bf8944952.tar.lz dexon-sol-tools-86caa4a0bb82e3ba7d362cca9b75565bf8944952.tar.xz dexon-sol-tools-86caa4a0bb82e3ba7d362cca9b75565bf8944952.tar.zst dexon-sol-tools-86caa4a0bb82e3ba7d362cca9b75565bf8944952.zip |
Ran prettier and linter
Diffstat (limited to 'packages/utils/src/abi_encoder/evm_data_types/tuple.ts')
-rw-r--r-- | packages/utils/src/abi_encoder/evm_data_types/tuple.ts | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/utils/src/abi_encoder/evm_data_types/tuple.ts b/packages/utils/src/abi_encoder/evm_data_types/tuple.ts index 54964235c..3d1cb5a92 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/tuple.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/tuple.ts @@ -5,7 +5,6 @@ import { DataTypeFactory } from '../abstract_data_types/interfaces'; import { AbstractSetDataType } from '../abstract_data_types/types/set'; export class TupleDataType extends AbstractSetDataType { - //private readonly _signature: string; public static matchType(type: string): boolean { return type === SolidityTypes.Tuple; @@ -16,7 +15,6 @@ export class TupleDataType extends AbstractSetDataType { if (!TupleDataType.matchType(dataItem.type)) { throw new Error(`Tried to instantiate Tuple with bad input: ${dataItem}`); } - //this._signature = } public getSignatureType(): string { @@ -24,9 +22,13 @@ export class TupleDataType extends AbstractSetDataType { } public getSignature(detailed?: boolean): string { - if (_.isEmpty(this.getDataItem().name) || !detailed) return this.getSignatureType(); + if (_.isEmpty(this.getDataItem().name) || !detailed) { + return this.getSignatureType(); + } const name = this.getDataItem().name; - const shortName = name.indexOf('.') > 0 ? name.substr(name.lastIndexOf('.') + 1) : name; + const lastIndexOfScopeDelimiter = name.lastIndexOf('.'); + const isScopedName = !_.isUndefined(lastIndexOfScopeDelimiter) && lastIndexOfScopeDelimiter > 0; + const shortName = isScopedName ? name.substr((lastIndexOfScopeDelimiter as number) + 1) : name; const detailedSignature = `${shortName} ${this._computeSignatureOfMembers(detailed)}`; return detailedSignature; } |