aboutsummaryrefslogtreecommitdiffstats
path: root/packages/utils/src/abi_encoder/abstract_data_types
diff options
context:
space:
mode:
Diffstat (limited to 'packages/utils/src/abi_encoder/abstract_data_types')
-rw-r--r--packages/utils/src/abi_encoder/abstract_data_types/data_type.ts6
-rw-r--r--packages/utils/src/abi_encoder/abstract_data_types/types/set.ts7
2 files changed, 7 insertions, 6 deletions
diff --git a/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts b/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts
index d9e854f51..f23324721 100644
--- a/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts
+++ b/packages/utils/src/abi_encoder/abstract_data_types/data_type.ts
@@ -51,14 +51,14 @@ export abstract class DataType {
return value;
}
- public decodeAsArray(returndata: string, rules?: DecodingRules): any {
+ public decodeAsArray(returndata: string, rules?: DecodingRules): any[] {
const value = this.decode(returndata, rules);
const valuesAsArray = _.isObject(value) ? _.values(value) : [value];
return valuesAsArray;
}
- public getSignature(detailed?: boolean): string {
- if (_.isEmpty(this._dataItem.name) || !detailed) {
+ public getSignature(isDetailed?: boolean): string {
+ if (_.isEmpty(this._dataItem.name) || !isDetailed) {
return this.getSignatureType();
}
const name = this.getDataItem().name;
diff --git a/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts b/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts
index e4be96235..2c6c4b0f6 100644
--- a/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts
+++ b/packages/utils/src/abi_encoder/abstract_data_types/types/set.ts
@@ -1,3 +1,4 @@
+import { ObjectMap } from '@0x/types';
import { DataItem } from 'ethereum-types';
import * as ethUtil from 'ethereumjs-util';
import * as _ from 'lodash';
@@ -140,7 +141,7 @@ export abstract class AbstractSetDataType extends DataType {
`Could not assign tuple to object: missing key '${memberName}' in object ${JSON.stringify(obj)}`,
);
}
- const memberValue: any = (obj as { [key: string]: any })[memberName];
+ const memberValue: any = (obj as ObjectMap<any>)[memberName];
const memberBlock = this._members[memberIndex].generateCalldataBlock(memberValue, block);
memberCalldataBlocks.push(memberBlock);
});
@@ -149,11 +150,11 @@ export abstract class AbstractSetDataType extends DataType {
return block;
}
- protected _computeSignatureOfMembers(detailed?: boolean): string {
+ protected _computeSignatureOfMembers(isDetailed?: boolean): string {
// Compute signature of members
let signature = `(`;
_.each(this._members, (member: DataType, i: number) => {
- signature += member.getSignature(detailed);
+ signature += member.getSignature(isDetailed);
if (i < this._members.length - 1) {
signature += ',';
}