aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-11-10 10:14:31 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-11-29 08:38:10 +0800
commit1f7fbcf52ccc037c4c4bb49e629eecc83e5309e5 (patch)
tree27b7eaa541e2be0b475a514d9d6698f9c7e75601
parent2802aed79cac4e73e64e1f33e328bcd05a4daf8b (diff)
downloaddexon-0x-contracts-1f7fbcf52ccc037c4c4bb49e629eecc83e5309e5.tar
dexon-0x-contracts-1f7fbcf52ccc037c4c4bb49e629eecc83e5309e5.tar.gz
dexon-0x-contracts-1f7fbcf52ccc037c4c4bb49e629eecc83e5309e5.tar.bz2
dexon-0x-contracts-1f7fbcf52ccc037c4c4bb49e629eecc83e5309e5.tar.lz
dexon-0x-contracts-1f7fbcf52ccc037c4c4bb49e629eecc83e5309e5.tar.xz
dexon-0x-contracts-1f7fbcf52ccc037c4c4bb49e629eecc83e5309e5.tar.zst
dexon-0x-contracts-1f7fbcf52ccc037c4c4bb49e629eecc83e5309e5.zip
Should build? TBD!
-rw-r--r--packages/order-utils/test/abi/abi_encoder.ts5
-rw-r--r--packages/order-utils/test/abi/evm_data_types.ts3
-rw-r--r--packages/order-utils/test/abi_encoder_test.ts5
3 files changed, 10 insertions, 3 deletions
diff --git a/packages/order-utils/test/abi/abi_encoder.ts b/packages/order-utils/test/abi/abi_encoder.ts
index 12755209a..ddcfb1fd1 100644
--- a/packages/order-utils/test/abi/abi_encoder.ts
+++ b/packages/order-utils/test/abi/abi_encoder.ts
@@ -1 +1,4 @@
-export * from './calldata_block'; \ No newline at end of file
+export * from './config';
+export * from './calldata';
+export * from './data_type';
+export * from './evm_data_types'; \ No newline at end of file
diff --git a/packages/order-utils/test/abi/evm_data_types.ts b/packages/order-utils/test/abi/evm_data_types.ts
index bdbaf5b3c..15fe4c9e3 100644
--- a/packages/order-utils/test/abi/evm_data_types.ts
+++ b/packages/order-utils/test/abi/evm_data_types.ts
@@ -400,9 +400,10 @@ export class Method extends MemberDataType {
return selector;
}
- public encode(value: any[] | object, calldata = new Calldata()) {
+ public encode(value: any[] | object, calldata = new Calldata()): string {
calldata.setSelector(this.methodSelector);
super.encode(value, calldata);
+ return calldata.toHexString();
}
public getSignature(): string {
diff --git a/packages/order-utils/test/abi_encoder_test.ts b/packages/order-utils/test/abi_encoder_test.ts
index c8a0642ea..f46a1812c 100644
--- a/packages/order-utils/test/abi_encoder_test.ts
+++ b/packages/order-utils/test/abi_encoder_test.ts
@@ -12,7 +12,10 @@ import { MethodAbi, DataItem } from 'ethereum-types';
import { BigNumber } from '@0x/utils';
import { assert } from '@0x/order-utils/src/assert';
-import * as AbiEncoder from './abi_encoder';
+//import * as AbiEncoder from './abi_encoder';
+
+import * as AbiEncoder from './abi/abi_encoder';
+
import * as AbiSamples from './abi_samples';
chaiSetup.configure();