From 67d7540907b6467c4cdc6a23815ad152517b3328 Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Tue, 6 Feb 2018 11:27:01 -0800
Subject: Move BlockParam and BlockParamLiteral to shared types

---
 packages/subproviders/package.json                      | 1 +
 packages/subproviders/src/index.ts                      | 2 +-
 packages/subproviders/src/subproviders/nonce_tracker.ts | 4 +++-
 packages/subproviders/src/types.ts                      | 5 -----
 4 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'packages/subproviders')

diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 4310f8d4a..7934ecb66 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -33,6 +33,7 @@
     },
     "devDependencies": {
         "@0xproject/tslint-config": "^0.4.7",
+        "@0xproject/types": "^0.1.9",
         "@0xproject/utils": "^0.3.0",
         "@types/lodash": "^4.14.86",
         "@types/mocha": "^2.2.42",
diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts
index 4b3be4efd..67d52ee25 100644
--- a/packages/subproviders/src/index.ts
+++ b/packages/subproviders/src/index.ts
@@ -10,7 +10,7 @@ export { InjectedWeb3Subprovider } from './subproviders/injected_web3';
 export { RedundantRPCSubprovider } from './subproviders/redundant_rpc';
 export { LedgerSubprovider } from './subproviders/ledger';
 export { NonceTrackerSubprovider } from './subproviders/nonce_tracker';
-export { ECSignature, LedgerWalletSubprovider, LedgerCommunicationClient } from './types';
+export { ECSignature, LedgerWalletSubprovider, LedgerCommunicationClient, NonceSubproviderErrors } from './types';
 
 /**
  * A factory method for creating a LedgerEthereumClient usable in a browser context.
diff --git a/packages/subproviders/src/subproviders/nonce_tracker.ts b/packages/subproviders/src/subproviders/nonce_tracker.ts
index 2f94ea581..4b5c34f69 100644
--- a/packages/subproviders/src/subproviders/nonce_tracker.ts
+++ b/packages/subproviders/src/subproviders/nonce_tracker.ts
@@ -4,14 +4,16 @@ import EthereumTx = require('ethereumjs-tx');
 import ethUtil = require('ethereumjs-util');
 import providerEngineUtils = require('web3-provider-engine/util/rpc-cache-utils');
 
+import { BlockParamLiteral } from '@0xproject/types';
+
 import {
-    BlockParamLiteral,
     ErrorCallback,
     JSONRPCPayload,
     NonceSubproviderErrors,
     OptionalNextCallback,
 } from '../types';
 
+
 import { Subprovider } from './subprovider';
 
 const NONCE_TOO_LOW_ERROR_MESSAGE = 'Transaction nonce is too low';
diff --git a/packages/subproviders/src/types.ts b/packages/subproviders/src/types.ts
index 86b118767..65b7f6c8f 100644
--- a/packages/subproviders/src/types.ts
+++ b/packages/subproviders/src/types.ts
@@ -118,10 +118,5 @@ export enum NonceSubproviderErrors {
     CannotDetermineAddressFromPayload = 'CANNOT_DETERMINE_ADDRESS_FROM_PAYLOAD',
 }
 
-// Re-defined BlockParamLiteral here, rather than import it from 0x.js.
-export enum BlockParamLiteral {
-    Pending = 'pending',
-}
-
 export type OptionalNextCallback = (callback?: (err: Error | null, result: any, cb: any) => void) => void;
 export type ErrorCallback = (err: Error | null, data?: any) => void;
-- 
cgit v1.2.3