fix: remove last usages of Networks.ts file (#30)

BoltzExchange · Dec 20, 2018 · ba02a69 · ba02a69
1 parent 5250753
commit ba02a69
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 90 deletions.
diff --git a/lib/Boltz.ts b/lib/Boltz.ts
@@ -1,6 +1,7 @@
 import fs from 'fs';
 import { Arguments } from 'yargs';
 import { generateMnemonic } from 'bip39';
+import { Networks } from 'boltz-core';
 import Logger from './Logger';
 import Config, { ConfigType } from './Config';
 import LndClient from './lightning/LndClient';
@@ -9,7 +10,6 @@ import Service from './service/Service';
 import WalletManager, { Currency } from './wallet/WalletManager';
 import SwapManager from './swap/SwapManager';
 import ChainClient from './chain/ChainClient';
-import Networks from './consts/Networks';
 import Database from './db/Database';
 
 // TODO: configurable trading pairs

diff --git a/lib/cli/Utils.ts b/lib/cli/Utils.ts
@@ -1,10 +1,9 @@
 import { Arguments } from 'yargs';
-import inquire from './inquire';
 import { address, ECPair, Transaction } from 'bitcoinjs-lib';
+import { Networks, detectSwap, constructClaimTransaction, constructRefundTransaction } from 'boltz-core';
+import inquire from './inquire';
 import { getHexBuffer } from '../Utils';
-import Networks from '../consts/Networks';
 import { OutputType, OrderSide } from '../proto/boltzrpc_pb';
-import { detectSwap, constructClaimTransaction, constructRefundTransaction } from 'boltz-core';
 
 export const getOrderSide = (side: string) => {
   switch (side.toLowerCase()) {

diff --git a/lib/cli/commands/ClaimSwap.ts b/lib/cli/commands/ClaimSwap.ts
@@ -1,6 +1,6 @@
 import { Arguments } from 'yargs';
+import { Networks } from 'boltz-core';
 import { claimSwap, parseCommands } from '../Utils';
-import Networks from '../../consts/Networks';
 import { printResponse } from '../Command';
 import BuilderComponents from '../BuilderComponents';
 

diff --git a/lib/cli/commands/RefundSwap.ts b/lib/cli/commands/RefundSwap.ts
@@ -1,6 +1,6 @@
 import { Arguments } from 'yargs';
+import { Networks } from 'boltz-core';
 import { refundSwap, parseCommands } from '../Utils';
-import Networks from '../../consts/Networks';
 import { printResponse } from '../Command';
 import BuilderComponents from '../BuilderComponents';
 

diff --git a/lib/consts/Networks.ts b/lib/consts/Networks.ts
diff --git a/test/integration/chain/ChainClient.spec.ts b/test/integration/chain/ChainClient.spec.ts
@@ -1,9 +1,9 @@
 import { expect } from 'chai';
-import Logger from '../../../lib/Logger';
 import path from 'path';
 import { ECPair, TransactionBuilder, Transaction, Network } from 'bitcoinjs-lib';
+import { Networks } from 'boltz-core';
+import Logger from '../../../lib/Logger';
 import ChainClient from '../../../lib/chain/ChainClient';
-import Networks from '../../../lib/consts/Networks';
 
 describe('ChainClient', () => {
   it('BtcdClient should connect', async () => {

diff --git a/test/integration/swap/Swap.spec.ts b/test/integration/swap/Swap.spec.ts
@@ -1,8 +1,7 @@
 // tslint:disable:max-line-length
 import { crypto, address, ECPair } from 'bitcoinjs-lib';
-import { Scripts, pkRefundSwap, constructClaimTransaction, constructRefundTransaction, TransactionOutput, OutputType } from 'boltz-core';
+import { Networks, Scripts, pkRefundSwap, constructClaimTransaction, constructRefundTransaction, TransactionOutput, OutputType } from 'boltz-core';
 import { getHexBuffer } from '../../../lib/Utils';
-import Networks from '../../../lib/consts/Networks';
 import { btcManager, btcdClient, btcAddress } from '../chain/ChainClient.spec';
 
 const { p2shOutput, p2wshOutput, p2shP2wshOutput } = Scripts;

diff --git a/test/integration/wallet/Wallet.spec.ts b/test/integration/wallet/Wallet.spec.ts
@@ -1,9 +1,8 @@
 import { expect } from 'chai';
-import { OutputType } from 'boltz-core';
+import { OutputType, Networks } from 'boltz-core';
 import bip32 from 'bip32';
 import bip39 from 'bip39';
 import Wallet from '../../../lib/wallet/Wallet';
-import Networks from '../../../lib/consts/Networks';
 import { btcdClient, btcManager, btcAddress } from '../chain/ChainClient.spec';
 import Logger from '../../../lib/Logger';
 import Database from '../../../lib/db/Database';

diff --git a/test/unit/wallet/Wallet.spec.ts b/test/unit/wallet/Wallet.spec.ts
@@ -1,10 +1,9 @@
 import { expect } from 'chai';
 import { mock } from 'ts-mockito';
 import { address, crypto } from 'bitcoinjs-lib';
-import { OutputType } from 'boltz-core';
+import { Networks, OutputType } from 'boltz-core';
 import bip32 from 'bip32';
 import bip39 from 'bip39';
-import Networks from '../../../lib/consts/Networks';
 import Wallet from '../../../lib/wallet/Wallet';
 import ChainClient from '../../../lib/chain/ChainClient';
 import { getPubKeyHashEncodeFuntion, getHexBuffer } from '../../../lib/Utils';

diff --git a/test/unit/wallet/WalletManager.spec.ts b/test/unit/wallet/WalletManager.spec.ts
@@ -3,9 +3,9 @@ import { mock } from 'ts-mockito';
 import fs from 'fs';
 import bip32 from 'bip32';
 import bip39 from 'bip39';
+import { Networks } from 'boltz-core';
 import WalletManager from '../../../lib/wallet/WalletManager';
 import WalletErrors from '../../../lib/wallet/Errors';
-import Networks from '../../../lib/consts/Networks';
 import ChainClient from '../../../lib/chain/ChainClient';
 import LndClient from '../../../lib/lightning/LndClient';
 import Logger from '../../../lib/Logger';