Merge pull request #579 from 0xProject/breakUp0xjs

Split 0x.js into: contract-wrappers & order-watcher

2 files changed, 34 insertions, 19 deletions

diff --git a/packages/website/ts/containers/zero_ex_js_documentation.ts b/packages/website/ts/containers/zero_ex_js_documentation.ts
index 40853cb9e..f68e2335f 100644
--- a/packages/website/ts/containers/zero_ex_js_documentation.ts
+++ b/packages/website/ts/containers/zero_ex_js_documentation.ts
@@ -68,32 +68,38 @@ const docsInfoConfig: DocsInfoConfig = {
         [zeroExJsDocSections.exchange]: [
             '"0x.js/src/contract_wrappers/exchange_wrapper"',
             '"src/contract_wrappers/exchange_wrapper"',
+            '"contract-wrappers/src/contract_wrappers/exchange_wrapper"',
         ],
         [zeroExJsDocSections.tokenRegistry]: [
             '"0x.js/src/contract_wrappers/token_registry_wrapper"',
             '"src/contract_wrappers/token_registry_wrapper"',
+            '"contract-wrappers/src/contract_wrappers/token_registry_wrapper"',
         ],
         [zeroExJsDocSections.token]: [
             '"0x.js/src/contract_wrappers/token_wrapper"',
             '"src/contract_wrappers/token_wrapper"',
+            '"contract-wrappers/src/contract_wrappers/token_wrapper"',
         ],
         [zeroExJsDocSections.etherToken]: [
             '"0x.js/src/contract_wrappers/ether_token_wrapper"',
             '"src/contract_wrappers/ether_token_wrapper"',
+            '"contract-wrappers/src/contract_wrappers/ether_token_wrapper"',
         ],
         [zeroExJsDocSections.proxy]: [
             '"0x.js/src/contract_wrappers/proxy_wrapper"',
             '"0x.js/src/contract_wrappers/token_transfer_proxy_wrapper"',
-            '"src/contract_wrappers/token_transfer_proxy_wrapper"',
+            '"contract-wrappers/src/contract_wrappers/token_transfer_proxy_wrapper"',
         ],
         [zeroExJsDocSections.orderWatcher]: [
             '"0x.js/src/order_watcher/order_state_watcher"',
             '"src/order_watcher/order_state_watcher"',
+            '"order-watcher/src/order_watcher/order_watcher"',
         ],
         [zeroExJsDocSections.types]: [
             '"0x.js/src/types"',
             '"src/types"',
             '"types/src/index"',
+            '"contract-wrappers/src/types"',
             '"0x.js/src/contract_wrappers/generated/ether_token"',
             '"0x.js/src/contract_wrappers/generated/token"',
             '"0x.js/src/contract_wrappers/generated/exchange"',
@@ -114,7 +120,7 @@ const docsInfoConfig: DocsInfoConfig = {
             'Order',
             'SignedOrder',
             'ECSignature',
-            'ZeroExError',
+            'ContractWrappersError',
             'EventCallback',
             'EventCallbackAsync',
             'EventCallbackSync',
diff --git a/packages/website/ts/utils/utils.ts b/packages/website/ts/utils/utils.ts
index 0d77b9e72..472870f31 100644
--- a/packages/website/ts/utils/utils.ts
+++ b/packages/website/ts/utils/utils.ts
@@ -1,4 +1,4 @@
-import { ECSignature, ExchangeContractErrs, ZeroEx, ZeroExError } from '0x.js';
+import { ContractWrappersError, ECSignature, ExchangeContractErrs, ZeroEx } from '0x.js';
 import { OrderError } from '@0xproject/order-utils';
 import { constants as sharedConstants, EtherscanLinkSuffixes, Networks } from '@0xproject/react-shared';
 import { Provider } from '@0xproject/types';
@@ -6,7 +6,17 @@ import { BigNumber } from '@0xproject/utils';
 import deepEqual = require('deep-equal');
 import * as _ from 'lodash';
 import * as moment from 'moment';
-import { Environments, Order, Providers, ScreenWidths, Side, SideToAssetToken, Token, TokenByAddress } from 'ts/types';
+import {
+    BlockchainCallErrs,
+    Environments,
+    Order,
+    Providers,
+    ScreenWidths,
+    Side,
+    SideToAssetToken,
+    Token,
+    TokenByAddress,
+} from 'ts/types';
 import { configs } from 'ts/utils/configs';
 import { constants } from 'ts/utils/constants';
 import * as u2f from 'ts/vendor/u2f_api';
@@ -193,21 +203,20 @@ export const utils = {
         const isUniqueSymbol = _.isUndefined(tokenWithSameSymbolIfExists);
         return isUniqueName && isUniqueSymbol;
     },
-    zeroExErrToHumanReadableErrMsg(error: ZeroExError | ExchangeContractErrs, takerAddress: string): string {
-        const ZeroExErrorToHumanReadableError: { [error: string]: string } = {
-            [ZeroExError.ExchangeContractDoesNotExist]: 'Exchange contract does not exist',
-            [ZeroExError.EtherTokenContractDoesNotExist]: 'EtherToken contract does not exist',
-            [ZeroExError.TokenTransferProxyContractDoesNotExist]: 'TokenTransferProxy contract does not exist',
-            [ZeroExError.TokenRegistryContractDoesNotExist]: 'TokenRegistry contract does not exist',
-            [ZeroExError.TokenContractDoesNotExist]: 'Token contract does not exist',
-            [ZeroExError.ZRXContractDoesNotExist]: 'ZRX contract does not exist',
-            [ZeroExError.UnhandledError]: 'Unhandled error occured',
-            [ZeroExError.UserHasNoAssociatedAddress]: 'User has no addresses available',
+    zeroExErrToHumanReadableErrMsg(error: ContractWrappersError | ExchangeContractErrs, takerAddress: string): string {
+        const ContractWrappersErrorToHumanReadableError: { [error: string]: string } = {
+            [ContractWrappersError.ExchangeContractDoesNotExist]: 'Exchange contract does not exist',
+            [ContractWrappersError.EtherTokenContractDoesNotExist]: 'EtherToken contract does not exist',
+            [ContractWrappersError.TokenTransferProxyContractDoesNotExist]:
+                'TokenTransferProxy contract does not exist',
+            [ContractWrappersError.TokenRegistryContractDoesNotExist]: 'TokenRegistry contract does not exist',
+            [ContractWrappersError.TokenContractDoesNotExist]: 'Token contract does not exist',
+            [ContractWrappersError.ZRXContractDoesNotExist]: 'ZRX contract does not exist',
+            [BlockchainCallErrs.UserHasNoAssociatedAddresses]: 'User has no addresses available',
             [OrderError.InvalidSignature]: 'Order signature is not valid',
-            [ZeroExError.ContractNotDeployedOnNetwork]: 'Contract is not deployed on the detected network',
-            [ZeroExError.InvalidJump]: 'Invalid jump occured while executing the transaction',
-            [ZeroExError.OutOfGas]: 'Transaction ran out of gas',
-            [ZeroExError.NoNetworkId]: 'No network id detected',
+            [ContractWrappersError.ContractNotDeployedOnNetwork]: 'Contract is not deployed on the detected network',
+            [ContractWrappersError.InvalidJump]: 'Invalid jump occured while executing the transaction',
+            [ContractWrappersError.OutOfGas]: 'Transaction ran out of gas',
         };
         const exchangeContractErrorToHumanReadableError: {
             [error: string]: string;
@@ -240,7 +249,7 @@ export const utils = {
             [ExchangeContractErrs.InsufficientRemainingFillAmount]: 'Insufficient remaining fill amount',
         };
         const humanReadableErrorMsg =
-            exchangeContractErrorToHumanReadableError[error] || ZeroExErrorToHumanReadableError[error];
+            exchangeContractErrorToHumanReadableError[error] || ContractWrappersErrorToHumanReadableError[error];
         return humanReadableErrorMsg;
     },
     isParityNode(nodeVersion: string): boolean {