From 82a44559f6a3d795a6a8b0baa9486633bc884475 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Wed, 9 Jan 2019 11:18:56 -0800 Subject: Style cleanup for Compressed Calldata in Contract Wrappers PR --- .../protocol/test/utils/fill_order_combinatorial_utils.ts | 4 ++-- contracts/protocol/test/utils/types.ts | 2 +- .../utils/src/abi_encoder/abstract_data_types/data_type.ts | 6 +++--- .../utils/src/abi_encoder/abstract_data_types/types/set.ts | 7 ++++--- packages/utils/src/abi_encoder/evm_data_types/array.ts | 10 +++++----- packages/utils/src/abi_encoder/evm_data_types/method.ts | 8 ++++---- packages/utils/src/abi_encoder/evm_data_types/pointer.ts | 4 ++-- packages/utils/src/abi_encoder/evm_data_types/tuple.ts | 6 +++--- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/contracts/protocol/test/utils/fill_order_combinatorial_utils.ts b/contracts/protocol/test/utils/fill_order_combinatorial_utils.ts index 86490c37e..2fd33bebd 100644 --- a/contracts/protocol/test/utils/fill_order_combinatorial_utils.ts +++ b/contracts/protocol/test/utils/fill_order_combinatorial_utils.ts @@ -618,8 +618,8 @@ export class FillOrderCombinatorialUtils { params.takerAssetFillAmount, params.signature, ); - const paramsDecodeddByClient = this.exchangeWrapper.abiDecodeFillOrder(abiDataEncodedByContract); - expect(paramsDecodeddByClient).to.be.deep.equal(params, 'ABIEncodedFillOrderData'); + const paramsDecodedByClient = this.exchangeWrapper.abiDecodeFillOrder(abiDataEncodedByContract); + expect(paramsDecodedByClient).to.be.deep.equal(params, 'ABIEncodedFillOrderData'); } private async _getTakerAssetFillAmountAsync( signedOrder: SignedOrder, diff --git a/contracts/protocol/test/utils/types.ts b/contracts/protocol/test/utils/types.ts index b4cd88673..bbe4ffdab 100644 --- a/contracts/protocol/test/utils/types.ts +++ b/contracts/protocol/test/utils/types.ts @@ -3,6 +3,6 @@ import { BigNumber } from '@0x/utils'; export interface AbiDecodedFillOrderData { order: SignedOrder; - akerAssetFillAmount: BigNumber; + makerAssetFillAmount: BigNumber; signature: string; } 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)[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 += ','; } diff --git a/packages/utils/src/abi_encoder/evm_data_types/array.ts b/packages/utils/src/abi_encoder/evm_data_types/array.ts index 449de0568..d9607f47e 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/array.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/array.ts @@ -40,19 +40,19 @@ export class ArrayDataType extends AbstractSetDataType { return this._computeSignature(false); } - public getSignature(detailed?: boolean): string { - if (_.isEmpty(this.getDataItem().name) || !detailed) { + public getSignature(isDetailed?: boolean): string { + if (_.isEmpty(this.getDataItem().name) || !isDetailed) { return this.getSignatureType(); } const name = this.getDataItem().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._computeSignature(detailed)}`; + const detailedSignature = `${shortName} ${this._computeSignature(isDetailed)}`; return detailedSignature; } - private _computeSignature(detailed?: boolean): string { + private _computeSignature(isDetailed?: boolean): string { // Compute signature for a single array element const elementDataItem: DataItem = { type: this._elementType, @@ -63,7 +63,7 @@ export class ArrayDataType extends AbstractSetDataType { elementDataItem.components = elementComponents; } const elementDataType = this.getFactory().create(elementDataItem); - const elementSignature = elementDataType.getSignature(detailed); + const elementSignature = elementDataType.getSignature(isDetailed); // Construct signature for array of type `element` if (_.isUndefined(this._arrayLength)) { return `${elementSignature}[]`; diff --git a/packages/utils/src/abi_encoder/evm_data_types/method.ts b/packages/utils/src/abi_encoder/evm_data_types/method.ts index 6e3fdcf6d..c0cf80c74 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/method.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/method.ts @@ -44,14 +44,14 @@ export class MethodDataType extends AbstractSetDataType { return returnValues; } - public decodeReturnValuesAsArray(returndata: string, rules?: DecodingRules): any { - const returnValues = this.decodeReturnValues(returndata, rules); + public decodeReturnValuesAsArray(returnData: string, rules?: DecodingRules): any[] { + const returnValues = this.decodeReturnValues(returnData, rules); const returnValuesAsArray = _.isObject(returnValues) ? _.values(returnValues) : [returnValues]; return returnValuesAsArray; } - public decodeReturnValuesAsArrayOrNull(returndata: string, rules?: DecodingRules): any { - const returnValuesAsArray = this.decodeReturnValuesAsArray(returndata, rules); + public decodeReturnValuesAsArrayOrNull(returnData: string, rules?: DecodingRules): any { + const returnValuesAsArray = this.decodeReturnValuesAsArray(returnData, rules); const returnValue = _.isEmpty(returnValuesAsArray) ? [] : returnValuesAsArray; return returnValue; } diff --git a/packages/utils/src/abi_encoder/evm_data_types/pointer.ts b/packages/utils/src/abi_encoder/evm_data_types/pointer.ts index 8c3afe0c3..250db7c64 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/pointer.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/pointer.ts @@ -15,7 +15,7 @@ export class PointerDataType extends AbstractPointerDataType { return this._destination.getSignature(false); } - public getSignature(detailed?: boolean): string { - return this._destination.getSignature(detailed); + public getSignature(isDetailed?: boolean): string { + return this._destination.getSignature(isDetailed); } } 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 2370ecdef..5000c85e8 100644 --- a/packages/utils/src/abi_encoder/evm_data_types/tuple.ts +++ b/packages/utils/src/abi_encoder/evm_data_types/tuple.ts @@ -20,15 +20,15 @@ export class TupleDataType extends AbstractSetDataType { return this._computeSignatureOfMembers(false); } - public getSignature(detailed?: boolean): string { - if (_.isEmpty(this.getDataItem().name) || !detailed) { + public getSignature(isDetailed?: boolean): string { + if (_.isEmpty(this.getDataItem().name) || !isDetailed) { return this.getSignatureType(); } const name = this.getDataItem().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)}`; + const detailedSignature = `${shortName} ${this._computeSignatureOfMembers(isDetailed)}`; return detailedSignature; } } -- cgit