From 4ca706d4e6404eaeb9e53494dbc98aabbf2e33f2 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Tue, 20 Mar 2018 13:06:59 +0000
Subject: Remove duplicate ECSignature type def

---
 packages/subproviders/src/index.ts | 4 +++-
 packages/subproviders/src/types.ts | 9 +++------
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'packages/subproviders/src')

diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts
index 9c409e3d9..0dc053286 100644
--- a/packages/subproviders/src/index.ts
+++ b/packages/subproviders/src/index.ts
@@ -2,7 +2,6 @@ import Eth from '@ledgerhq/hw-app-eth';
 import TransportU2F from '@ledgerhq/hw-transport-u2f';
 
 import { LedgerEthereumClient } from './types';
-export { Callback, ErrorCallback, NextCallback } from './types';
 
 export { EmptyWalletSubprovider } from './subproviders/empty_wallet_subprovider';
 export { FakeGasEstimateSubprovider } from './subproviders/fake_gas_estimate_subprovider';
@@ -13,6 +12,9 @@ export { GanacheSubprovider } from './subproviders/ganache';
 export { Subprovider } from './subproviders/subprovider';
 export { NonceTrackerSubprovider } from './subproviders/nonce_tracker';
 export {
+    Callback,
+    ErrorCallback,
+    NextCallback,
     ECSignature,
     LedgerWalletSubprovider,
     LedgerCommunicationClient,
diff --git a/packages/subproviders/src/types.ts b/packages/subproviders/src/types.ts
index 09095a53d..9bb9ff696 100644
--- a/packages/subproviders/src/types.ts
+++ b/packages/subproviders/src/types.ts
@@ -1,6 +1,9 @@
+import { ECSignature } from '@0xproject/types';
 import * as _ from 'lodash';
 import * as Web3 from 'web3';
 
+export { ECSignature } from '@0xproject/types';
+
 export interface LedgerCommunicationClient {
     close: () => Promise<void>;
 }
@@ -29,12 +32,6 @@ export interface ECSignatureString {
     s: string;
 }
 
-export interface ECSignature {
-    v: number;
-    r: string;
-    s: string;
-}
-
 export type LedgerEthereumClientFactoryAsync = () => Promise<LedgerEthereumClient>;
 
 /*
-- 
cgit