From 8b91727364c205cd2bd44abdabd62c1044dd13d4 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Thu, 8 Nov 2018 13:57:36 -0800
Subject: types with default widths

---
 packages/order-utils/test/abi_encoder.ts      | 22 +++++++----------
 packages/order-utils/test/abi_encoder_test.ts | 12 +++++++++
 packages/order-utils/test/abi_samples.ts      | 35 +++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 13 deletions(-)

(limited to 'packages')

diff --git a/packages/order-utils/test/abi_encoder.ts b/packages/order-utils/test/abi_encoder.ts
index 83ecc2f9a..bcd427dee 100644
--- a/packages/order-utils/test/abi_encoder.ts
+++ b/packages/order-utils/test/abi_encoder.ts
@@ -781,20 +781,16 @@ export class SolArray extends DynamicDataType {
     }
 
     public getSignature(): string {
-        let type = this.type;
-        if (this.type === 'tuple') {
-            let tupleDataItem = {
-                type: 'tuple',
-                name: 'N/A',
-            } as DataItem;
-            const tupleComponents = this.getDataItem().components;
-            if (tupleComponents !== undefined) {
-                tupleDataItem.components = tupleComponents;
-            }
-            const tuple = new Tuple(tupleDataItem);
-            type = tuple.getSignature();
+        let dataItem = {
+            type: this.type,
+            name: 'N/A',
+        } as DataItem;
+        const components = this.getDataItem().components;
+        if (components !== undefined) {
+            dataItem.components = components;
         }
-
+        const elementDataType = DataTypeFactory.mapDataItemToDataType(dataItem);
+        const type = elementDataType.getSignature();
         if (this.length.equals(SolArray.UNDEFINED_LENGTH)) {
             return `${type}[]`;
         }
diff --git a/packages/order-utils/test/abi_encoder_test.ts b/packages/order-utils/test/abi_encoder_test.ts
index cea33112d..ad43e70a3 100644
--- a/packages/order-utils/test/abi_encoder_test.ts
+++ b/packages/order-utils/test/abi_encoder_test.ts
@@ -134,6 +134,18 @@ describe.only('ABI Encoder', () => {
             expect(calldata).to.be.equal(expectedCalldata);*/
         });
 
+        it.only('Types with default widths', async () => {
+            const method = new AbiEncoder.Method(AbiSamples.typesWithDefaultWidthsAbi);
+            const args = [new BigNumber(1), new BigNumber(-1), '0x56', [new BigNumber(1)], [new BigNumber(-1)], ['0x56']];
+            const calldata = method.encode(args);
+            console.log(calldata);
+            console.log('*'.repeat(40));
+            console.log(method.getSignature());
+            console.log(JSON.stringify(args));
+            const expectedCalldata = '0x09f2b0c30000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff560000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000000000015600000000000000000000000000000000000000000000000000000000000000';
+            expect(calldata).to.be.equal(expectedCalldata);
+        });
+
         it('Array of Static Tuples (Array has defined length)', async () => {
             const method = new AbiEncoder.Method(AbiSamples.arrayOfStaticTuplesWithDefinedLengthAbi);
 
diff --git a/packages/order-utils/test/abi_samples.ts b/packages/order-utils/test/abi_samples.ts
index 7939cbaeb..921408724 100644
--- a/packages/order-utils/test/abi_samples.ts
+++ b/packages/order-utils/test/abi_samples.ts
@@ -34,6 +34,41 @@ export const stringAbi = {
     type: 'function',
 } as MethodAbi;
 
+export const typesWithDefaultWidthsAbi = {
+    constant: false,
+    inputs: [
+        {
+            name: 'someUint',
+            type: 'uint',
+        },
+        {
+            name: 'someInt',
+            type: 'int',
+        },
+        {
+            name: 'someByte',
+            type: 'byte',
+        },
+        {
+            name: 'someUint',
+            type: 'uint[]',
+        },
+        {
+            name: 'someInt',
+            type: 'int[]',
+        },
+        {
+            name: 'someByte',
+            type: 'byte[]',
+        },
+    ],
+    name: 'simpleFunction',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function',
+} as MethodAbi;
+
 export const multiDimensionalArraysStaticTypeAbi = {
     constant: false,
     inputs: [
-- 
cgit