diff options
author | Greg Hysen <greg.hysen@gmail.com> | 2018-11-10 10:18:52 +0800 |
---|---|---|
committer | Greg Hysen <greg.hysen@gmail.com> | 2018-11-29 08:38:10 +0800 |
commit | 0835cf0ea2bb3c2c18d2a5d44ec914e2945af1b0 (patch) | |
tree | 3c4d5632bc733494f4c43561653978b40ef2ab89 /packages/order-utils/test/abi/data_type.ts | |
parent | 1f7fbcf52ccc037c4c4bb49e629eecc83e5309e5 (diff) | |
download | dexon-sol-tools-0835cf0ea2bb3c2c18d2a5d44ec914e2945af1b0.tar dexon-sol-tools-0835cf0ea2bb3c2c18d2a5d44ec914e2945af1b0.tar.gz dexon-sol-tools-0835cf0ea2bb3c2c18d2a5d44ec914e2945af1b0.tar.bz2 dexon-sol-tools-0835cf0ea2bb3c2c18d2a5d44ec914e2945af1b0.tar.lz dexon-sol-tools-0835cf0ea2bb3c2c18d2a5d44ec914e2945af1b0.tar.xz dexon-sol-tools-0835cf0ea2bb3c2c18d2a5d44ec914e2945af1b0.tar.zst dexon-sol-tools-0835cf0ea2bb3c2c18d2a5d44ec914e2945af1b0.zip |
Refactor Builds!
Diffstat (limited to 'packages/order-utils/test/abi/data_type.ts')
-rw-r--r-- | packages/order-utils/test/abi/data_type.ts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/order-utils/test/abi/data_type.ts b/packages/order-utils/test/abi/data_type.ts index 1a4610f7c..201eb89f9 100644 --- a/packages/order-utils/test/abi/data_type.ts +++ b/packages/order-utils/test/abi/data_type.ts @@ -31,7 +31,7 @@ export abstract class PayloadDataType extends DataType { this.hasConstantSize = hasConstantSize; } - public generateCalldataBlocks(value: any, parentBlock?: CalldataBlock): PayloadCalldataBlock { + public generateCalldataBlock(value: any, parentBlock?: CalldataBlock): PayloadCalldataBlock { const encodedValue = this.encodeValue(value); const name = this.getDataItem().name; const signature = this.getSignature(); @@ -105,13 +105,13 @@ export abstract class MemberDataType extends DataType { this.isArray = isArray; this.arrayLength = arrayLength; if (isArray && arrayLength !== undefined) { - [this.members, this.memberMap] = MemberDataType.createMembersWithLength(dataItem, arrayLength); + [this.members, this.memberMap] = this.createMembersWithLength(dataItem, arrayLength); } else if (!isArray) { - [this.members, this.memberMap] = MemberDataType.createMembersWithKeys(dataItem); + [this.members, this.memberMap] = this.createMembersWithKeys(dataItem); } } - private static createMembersWithKeys(dataItem: DataItem): [DataType[], MemberMap] { + private createMembersWithKeys(dataItem: DataItem): [DataType[], MemberMap] { // Sanity check if (dataItem.components === undefined) { throw new Error(`Expected components`); @@ -132,7 +132,7 @@ export abstract class MemberDataType extends DataType { return [members, memberMap]; } - private static createMembersWithLength(dataItem: DataItem, length: number): [DataType[], MemberMap] { + private createMembersWithLength(dataItem: DataItem, length: number): [DataType[], MemberMap] { let members: DataType[] = []; let memberMap: MemberMap = {}; const range = _.range(length); @@ -165,7 +165,7 @@ export abstract class MemberDataType extends DataType { let members = this.members; if (this.arrayLength === undefined) { - [members,] = MemberDataType.createMembersWithLength(this.getDataItem(), value.length); + [members,] = this.createMembersWithLength(this.getDataItem(), value.length); } const methodBlock: MemberCalldataBlock = new MemberCalldataBlock(this.getDataItem().name, this.getSignature(), false); @@ -200,7 +200,7 @@ export abstract class MemberDataType extends DataType { } public generateCalldataBlock(value: any[] | object, parentBlock?: CalldataBlock): MemberCalldataBlock { - const block = (value instanceof Array) ? this.generateCalldataBlockFromArray(value) : this.generateCalldataBlockFromObject(value, calldata); + const block = (value instanceof Array) ? this.generateCalldataBlockFromArray(value) : this.generateCalldataBlockFromObject(value); return block; } |