Moved Abi Encoder into utils package

0xProject · Nov 29, 2018 · 5b0d554 · 5b0d554
1 parent 71c0503
commit 5b0d554
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 12 deletions.
diff --git a/.../order-utils/test/abi_encoder/calldata.ts → packages/utils/src/abi_encoder/calldata.ts b/.../order-utils/test/abi_encoder/calldata.ts → packages/utils/src/abi_encoder/calldata.ts
diff --git a/...order-utils/test/abi_encoder/data_type.ts → packages/utils/src/abi_encoder/data_type.ts b/...order-utils/test/abi_encoder/data_type.ts → packages/utils/src/abi_encoder/data_type.ts
@@ -1,7 +1,7 @@
 import { RawCalldata, Calldata, CalldataBlock, PayloadCalldataBlock, DependentCalldataBlock, MemberCalldataBlock } from "./calldata";
 import { MethodAbi, DataItem } from 'ethereum-types';
 import { DecodingRules, EncodingRules } from './calldata';
-import { BigNumber } from '@0x/utils';
+import { BigNumber } from '../configured_bignumber';
 import ethUtil = require('ethereumjs-util');
 var _ = require('lodash');
 

diff --git a/...-utils/test/abi_encoder/evm_data_types.ts → ...s/utils/src/abi_encoder/evm_data_types.ts b/...-utils/test/abi_encoder/evm_data_types.ts → ...s/utils/src/abi_encoder/evm_data_types.ts
@@ -8,7 +8,7 @@ import ethUtil = require('ethereumjs-util');
 
 import { Calldata, RawCalldata } from './calldata';
 
-import { BigNumber } from '@0x/utils';
+import { BigNumber } from '../configured_bignumber';
 
 var _ = require('lodash');
 

diff --git a/...ges/order-utils/test/abi_encoder/index.ts → packages/utils/src/abi_encoder/index.ts b/...ges/order-utils/test/abi_encoder/index.ts → packages/utils/src/abi_encoder/index.ts
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -10,3 +10,4 @@ export { NULL_BYTES } from './constants';
 export { errorUtils } from './error_utils';
 export { fetchAsync } from './fetch_async';
 export { signTypedDataUtils } from './sign_typed_data_utils';
+export * from './abi_encoder';
diff --git a/...ages/order-utils/test/abi_encoder_test.ts → packages/utils/test/abi_encoder_test.ts b/...ages/order-utils/test/abi_encoder_test.ts → packages/utils/test/abi_encoder_test.ts
@@ -1,21 +1,13 @@
 import * as chai from 'chai';
 import 'mocha';
-import ethUtil = require('ethereumjs-util');
-
-var _ = require('lodash');
 
 // import { assert } from '@0x/order-utils/src/assert';
 
 import { chaiSetup } from './utils/chai_setup';
-
-import { MethodAbi, DataItem } from 'ethereum-types';
-
-import { BigNumber } from '@0x/utils';
-import { assert } from '@0x/order-utils/src/assert';
+import { BigNumber } from '../src/';
 //import * as AbiEncoder from './abi_encoder';
 
-import * as AbiEncoder from './abi_encoder';
-
+import * as AbiEncoder from '../src/abi_encoder';
 import * as AbiSamples from './abi_samples';
 
 chaiSetup.configure();

diff --git a/packages/order-utils/test/abi_samples.ts → packages/utils/test/abi_samples.ts b/packages/order-utils/test/abi_samples.ts → packages/utils/test/abi_samples.ts
diff --git a/packages/utils/test/utils/chai_setup.ts b/packages/utils/test/utils/chai_setup.ts
@@ -0,0 +1,13 @@
+import * as chai from 'chai';
+import chaiAsPromised = require('chai-as-promised');
+import ChaiBigNumber = require('chai-bignumber');
+import * as dirtyChai from 'dirty-chai';
+
+export const chaiSetup = {
+    configure(): void {
+        chai.config.includeStack = true;
+        chai.use(ChaiBigNumber());
+        chai.use(dirtyChai);
+        chai.use(chaiAsPromised);
+    },
+};