aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-05-10 22:51:45 +0800
committerFabio Berger <me@fabioberger.com>2018-05-10 22:51:45 +0800
commitc6882d0bd8615209dfc2e486bcfa5b64fcb50242 (patch)
treeac731f93f6691d4424264a3aaecbe0982aada49b
parentce47e8393937f5e29da969a8c9ace2c924a66d81 (diff)
downloaddexon-0x-contracts-c6882d0bd8615209dfc2e486bcfa5b64fcb50242.tar
dexon-0x-contracts-c6882d0bd8615209dfc2e486bcfa5b64fcb50242.tar.gz
dexon-0x-contracts-c6882d0bd8615209dfc2e486bcfa5b64fcb50242.tar.bz2
dexon-0x-contracts-c6882d0bd8615209dfc2e486bcfa5b64fcb50242.tar.lz
dexon-0x-contracts-c6882d0bd8615209dfc2e486bcfa5b64fcb50242.tar.xz
dexon-0x-contracts-c6882d0bd8615209dfc2e486bcfa5b64fcb50242.tar.zst
dexon-0x-contracts-c6882d0bd8615209dfc2e486bcfa5b64fcb50242.zip
Rename zeroExContract... to contractWrappers...
-rw-r--r--packages/0x.js/src/0x.ts4
-rw-r--r--packages/0x.js/src/index.ts2
-rw-r--r--packages/contract-wrappers/src/contract_wrappers.ts16
-rw-r--r--packages/contract-wrappers/src/index.ts2
-rw-r--r--packages/contract-wrappers/src/schemas/contract_wrappers_config_schema.ts (renamed from packages/contract-wrappers/src/schemas/zero_ex_contract_config_schema.ts)4
-rw-r--r--packages/contract-wrappers/src/schemas/contract_wrappers_private_network_config_schema.ts (renamed from packages/contract-wrappers/src/schemas/zero_ex_contract_private_network_config_schema.ts)2
-rw-r--r--packages/contract-wrappers/src/schemas/contract_wrappers_public_network_config_schema.ts (renamed from packages/contract-wrappers/src/schemas/zero_ex_contract_public_network_config_schema.ts)2
-rw-r--r--packages/contract-wrappers/src/types.ts2
8 files changed, 17 insertions, 17 deletions
diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index c68a17015..9bcb0dddc 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -6,7 +6,7 @@ import {
TokenRegistryWrapper,
TokenTransferProxyWrapper,
TokenWrapper,
- ZeroExContractConfig,
+ ContractWrappersConfig,
} from '@0xproject/contract-wrappers';
import {
generatePseudoRandomSalt,
@@ -131,7 +131,7 @@ export class ZeroEx {
* @param config The configuration object. Look up the type for the description.
* @return An instance of the 0x.js ZeroEx class.
*/
- constructor(provider: Provider, config: ZeroExContractConfig) {
+ constructor(provider: Provider, config: ContractWrappersConfig) {
assert.isWeb3Provider('provider', provider);
this._contractWrappers = new ContractWrappers(provider, config);
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index e9528d4d1..c79dbdb77 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -47,5 +47,5 @@ export {
LogFillContractEventArgs,
ExchangeContractEventArgs,
ExchangeEvents,
- ZeroExContractConfig,
+ ContractWrappersConfig,
} from '@0xproject/contract-wrappers';
diff --git a/packages/contract-wrappers/src/contract_wrappers.ts b/packages/contract-wrappers/src/contract_wrappers.ts
index 1934ea2d0..381c4a63f 100644
--- a/packages/contract-wrappers/src/contract_wrappers.ts
+++ b/packages/contract-wrappers/src/contract_wrappers.ts
@@ -18,10 +18,10 @@ import { ExchangeWrapper } from './contract_wrappers/exchange_wrapper';
import { TokenRegistryWrapper } from './contract_wrappers/token_registry_wrapper';
import { TokenTransferProxyWrapper } from './contract_wrappers/token_transfer_proxy_wrapper';
import { TokenWrapper } from './contract_wrappers/token_wrapper';
-import { zeroExContractConfigSchema } from './schemas/zero_ex_contract_config_schema';
-import { zeroExContractPrivateNetworkConfigSchema } from './schemas/zero_ex_contract_private_network_config_schema';
-import { zeroExContractPublicNetworkConfigSchema } from './schemas/zero_ex_contract_public_network_config_schema';
-import { ZeroExContractConfig } from './types';
+import { ContractWrappersConfigSchema } from './schemas/contract_wrappers_config_schema';
+import { contractWrappersPrivateNetworkConfigSchema } from './schemas/contract_wrappers_private_network_config_schema';
+import { contractWrappersPublicNetworkConfigSchema } from './schemas/contract_wrappers_public_network_config_schema';
+import { ContractWrappersConfig } from './types';
import { assert } from './utils/assert';
import { constants } from './utils/constants';
import { decorators } from './utils/decorators';
@@ -62,11 +62,11 @@ export class ContractWrappers {
* @param config The configuration object. Look up the type for the description.
* @return An instance of the ContractWrappers class.
*/
- constructor(provider: Provider, config: ZeroExContractConfig) {
+ constructor(provider: Provider, config: ContractWrappersConfig) {
assert.isWeb3Provider('provider', provider);
- assert.doesConformToSchema('config', config, zeroExContractConfigSchema, [
- zeroExContractPrivateNetworkConfigSchema,
- zeroExContractPublicNetworkConfigSchema,
+ assert.doesConformToSchema('config', config, ContractWrappersConfigSchema, [
+ contractWrappersPrivateNetworkConfigSchema,
+ contractWrappersPublicNetworkConfigSchema,
]);
const artifactJSONs = _.values(artifacts);
const abiArrays = _.map(artifactJSONs, artifact => artifact.abi);
diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index f88313eb1..45af8a707 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -15,7 +15,7 @@ export {
OrderCancellationRequest,
OrderFillRequest,
ContractEventArgs,
- ZeroExContractConfig,
+ ContractWrappersConfig,
MethodOpts,
OrderTransactionOpts,
TransactionOpts,
diff --git a/packages/contract-wrappers/src/schemas/zero_ex_contract_config_schema.ts b/packages/contract-wrappers/src/schemas/contract_wrappers_config_schema.ts
index eec386643..ac248b2d4 100644
--- a/packages/contract-wrappers/src/schemas/zero_ex_contract_config_schema.ts
+++ b/packages/contract-wrappers/src/schemas/contract_wrappers_config_schema.ts
@@ -1,5 +1,5 @@
-export const zeroExContractConfigSchema = {
- id: '/ZeroExContractConfig',
+export const ContractWrappersConfigSchema = {
+ id: '/ContractWrappersConfig',
oneOf: [{ $ref: '/ZeroExContractPrivateNetworkConfig' }, { $ref: '/ZeroExContractPublicNetworkConfig' }],
type: 'object',
};
diff --git a/packages/contract-wrappers/src/schemas/zero_ex_contract_private_network_config_schema.ts b/packages/contract-wrappers/src/schemas/contract_wrappers_private_network_config_schema.ts
index 6d93d4e60..759078feb 100644
--- a/packages/contract-wrappers/src/schemas/zero_ex_contract_private_network_config_schema.ts
+++ b/packages/contract-wrappers/src/schemas/contract_wrappers_private_network_config_schema.ts
@@ -1,4 +1,4 @@
-export const zeroExContractPrivateNetworkConfigSchema = {
+export const contractWrappersPrivateNetworkConfigSchema = {
id: '/ZeroExContractPrivateNetworkConfig',
properties: {
networkId: {
diff --git a/packages/contract-wrappers/src/schemas/zero_ex_contract_public_network_config_schema.ts b/packages/contract-wrappers/src/schemas/contract_wrappers_public_network_config_schema.ts
index 79a241cd2..bf1000afa 100644
--- a/packages/contract-wrappers/src/schemas/zero_ex_contract_public_network_config_schema.ts
+++ b/packages/contract-wrappers/src/schemas/contract_wrappers_public_network_config_schema.ts
@@ -1,4 +1,4 @@
-export const zeroExContractPublicNetworkConfigSchema = {
+export const contractWrappersPublicNetworkConfigSchema = {
id: '/ZeroExContractPublicNetworkConfig',
properties: {
networkId: {
diff --git a/packages/contract-wrappers/src/types.ts b/packages/contract-wrappers/src/types.ts
index 301b5abf9..9a463d635 100644
--- a/packages/contract-wrappers/src/types.ts
+++ b/packages/contract-wrappers/src/types.ts
@@ -127,7 +127,7 @@ export type SyncMethod = (...args: any[]) => any;
* tokenTransferProxyContractAddress: The address of the token transfer proxy contract to use
* orderWatcherConfig: All the configs related to the orderWatcher
*/
-export interface ZeroExContractConfig {
+export interface ContractWrappersConfig {
networkId: number;
gasPrice?: BigNumber;
exchangeContractAddress?: string;