crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename zeroExContract... to contractWrappers...

Browse Source
This commit is contained in:
Fabio Berger 2018-05-10 16:51:45 +02:00
parent ce47e83939
commit c6882d0bd8
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/0x.js/src/0x.ts
View File

@ -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);

2
packages/0x.js/src/index.ts
View File

@ -47,5 +47,5 @@ export {
LogFillContractEventArgs,
ExchangeContractEventArgs,
ExchangeEvents,
ZeroExContractConfig,
ContractWrappersConfig,
} from '@0xproject/contract-wrappers';

16
packages/contract-wrappers/src/contract_wrappers.ts
View File

@ -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);

2
packages/contract-wrappers/src/index.ts
View File

@ -15,7 +15,7 @@ export {
OrderCancellationRequest,
OrderFillRequest,
ContractEventArgs,
ZeroExContractConfig,
ContractWrappersConfig,
MethodOpts,
OrderTransactionOpts,
TransactionOpts,

4
packages/contract-wrappers/src/schemas/zero_ex_contract_config_schema.ts → packages/contract-wrappers/src/schemas/contract_wrappers_config_schema.ts
View File

@ -1,5 +1,5 @@
export const zeroExContractConfigSchema = {
id: '/ZeroExContractConfig',
export const ContractWrappersConfigSchema = {
id: '/ContractWrappersConfig',
oneOf: [{ $ref: '/ZeroExContractPrivateNetworkConfig' }, { $ref: '/ZeroExContractPublicNetworkConfig' }],
type: 'object',
};

2
packages/contract-wrappers/src/schemas/zero_ex_contract_private_network_config_schema.ts → packages/contract-wrappers/src/schemas/contract_wrappers_private_network_config_schema.ts
View File

@ -1,4 +1,4 @@
export const zeroExContractPrivateNetworkConfigSchema = {
export const contractWrappersPrivateNetworkConfigSchema = {
id: '/ZeroExContractPrivateNetworkConfig',
properties: {
networkId: {

2
packages/contract-wrappers/src/schemas/zero_ex_contract_public_network_config_schema.ts → packages/contract-wrappers/src/schemas/contract_wrappers_public_network_config_schema.ts
View File

@ -1,4 +1,4 @@
export const zeroExContractPublicNetworkConfigSchema = {
export const contractWrappersPublicNetworkConfigSchema = {
id: '/ZeroExContractPublicNetworkConfig',
properties: {
networkId: {

2
packages/contract-wrappers/src/types.ts
View File

@ -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;