chore(Config): remove unused config, networks come from options

blockchain · Jan 5, 2019 · fc6b94c · fc6b94c
1 parent 8c21f42
commit fc6b94c
Show file tree

Hide file tree

Showing 22 changed files with 77 additions and 117 deletions.
diff --git a/config/mocks/wallet-options-v4.json b/config/mocks/wallet-options-v4.json
@@ -98,7 +98,7 @@
         },
         "lastTxFuse": 86400,
         "config": {
-          "network": "mainnet"
+          "network": 1
         }
       },
       "xlm": {

diff --git a/packages/blockchain-wallet-v4-frontend/src/config/index.js b/packages/blockchain-wallet-v4-frontend/src/config/index.js
diff --git a/packages/blockchain-wallet-v4-frontend/src/config/index.spec.js b/packages/blockchain-wallet-v4-frontend/src/config/index.spec.js
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/sagas.utils.js b/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/sagas.utils.js
@@ -4,14 +4,14 @@ import BigNumber from 'bignumber.js'
 
 import { selectors, actions } from 'data'
 import * as S from './selectors'
-import settings from 'config'
 import { convertStandardToBase } from './services'
 import { CREATE_ACCOUNT_ERROR, NO_ACCOUNT_ERROR, RESERVE_ERROR } from './model'
 import { ADDRESS_TYPES } from 'blockchain-wallet-v4/src/redux/payment/btc/utils'
 import { Exchange } from 'blockchain-wallet-v4'
 
 const PROVISIONAL_BTC_SCRIPT = '00000000000000000000000'
 const PROVISIONAL_BCH_SCRIPT = '0000000000000000000000000'
+const PROVISIONAL_BSV_SCRIPT = '0000000000000000000000000'
 export default ({ coreSagas, networks }) => {
   const logLocation = 'components/exchange/sagas.utils'
 
@@ -33,11 +33,10 @@ export default ({ coreSagas, networks }) => {
     }
     return prevPayment
   }
-
-  const btcOptions = [settings.NETWORK_BTC, PROVISIONAL_BTC_SCRIPT]
-  const bchOptions = [settings.NETWORK_BCH, PROVISIONAL_BCH_SCRIPT]
-  const bsvOptions = [settings.NETWORK_BCH, PROVISIONAL_BCH_SCRIPT]
-  const ethOptions = [settings.NETWORK_ETH, null]
+  const btcOptions = [networks.btc, PROVISIONAL_BTC_SCRIPT]
+  const bchOptions = [networks.bch, PROVISIONAL_BCH_SCRIPT]
+  const bsvOptions = [networks.bsv, PROVISIONAL_BSV_SCRIPT]
+  const ethOptions = [networks.eth, null]
   const xlmOptions = [null, null]
   const calculateProvisionalPayment = function*(source, amount) {
     try {
@@ -94,7 +93,7 @@ export default ({ coreSagas, networks }) => {
     switch (coin) {
       case 'BCH':
         payment = yield coreSagas.payment.bch
-          .create({ network: settings.NETWORK_BCH })
+          .create({ network: networks.bch })
           .chain()
           .init()
           .fee('priority')
@@ -103,7 +102,7 @@ export default ({ coreSagas, networks }) => {
         break
       case 'BSV':
         payment = yield coreSagas.payment.bsv
-          .create({ network: settings.NETWORK_BCH })
+          .create({ network: networks.bch })
           .chain()
           .init()
           .fee('priority')
@@ -121,7 +120,7 @@ export default ({ coreSagas, networks }) => {
         break
       case 'ETH':
         payment = yield coreSagas.payment.eth
-          .create({ network: settings.NETWORK_ETH })
+          .create({ network: networks.eth })
           .chain()
           .init()
           .fee('priority')
@@ -161,15 +160,15 @@ export default ({ coreSagas, networks }) => {
     switch (coin) {
       case 'BCH':
         payment = coreSagas.payment.bch
-          .create({ network: settings.NETWORK_BCH })
+          .create({ network: networks.bch })
           .chain()
           .init()
           .fee('priority')
           .amount(parseInt(amount))
         break
       case 'BSV':
         payment = coreSagas.payment.bsv
-          .create({ network: settings.NETWORK_BCH })
+          .create({ network: networks.bch })
           .chain()
           .init()
           .fee('priority')
@@ -185,7 +184,7 @@ export default ({ coreSagas, networks }) => {
         break
       case 'ETH':
         payment = coreSagas.payment.eth
-          .create({ network: settings.NETWORK_ETH })
+          .create({ network: networks.eth })
           .chain()
           .init()
           .fee('priority')

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sagaRegister.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sagaRegister.js
@@ -55,10 +55,10 @@ export default ({ api, coreSagas, networks, options }) =>
     yield fork(requestBch({ networks }))
     yield fork(requestEth({ networks }))
     yield fork(requestXlm())
-    yield fork(sendBch({ coreSagas }))
+    yield fork(sendBch({ coreSagas, networks }))
     yield fork(sendBtc({ coreSagas, networks }))
-    yield fork(sendBsv({ coreSagas }))
-    yield fork(sendEth({ coreSagas }))
+    yield fork(sendBsv({ coreSagas, networks }))
+    yield fork(sendEth({ coreSagas, networks }))
     yield fork(sendXlm({ coreSagas }))
     yield fork(settings({ coreSagas }))
     yield fork(signMessage({ coreSagas }))

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sagas.js
@@ -30,7 +30,7 @@ import transactionReport from './transactionReport/sagas'
 import uploadDocuments from './uploadDocuments/sagas'
 import veriff from './veriff/sagas'
 
-export default ({ api, coreSagas, options, networks }) => ({
+export default ({ api, coreSagas, networks }) => ({
   activityList: activityList(),
   bchTransactions: bchTransactions(),
   btcTransactions: btcTransactions(),
@@ -51,10 +51,10 @@ export default ({ api, coreSagas, options, networks }) => ({
   requestBch: requestBch(),
   requestEth: requestEth(),
   requestXlm: requestXlm(),
-  sendBch: sendBch({ coreSagas }),
+  sendBch: sendBch({ coreSagas, networks }),
   sendBtc: sendBtc({ coreSagas, networks }),
-  sendBsv: sendBsv({ coreSagas }),
-  sendEth: sendEth({ coreSagas }),
+  sendBsv: sendBsv({ coreSagas, networks }),
+  sendEth: sendEth({ coreSagas, networks }),
   sendXlm: sendXlm({ coreSagas }),
   settings: settings({ coreSagas }),
   signMessage: signMessage({ coreSagas }),

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagaRegister.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagaRegister.js
@@ -3,8 +3,8 @@ import * as AT from './actionTypes'
 import { actionTypes } from 'redux-form'
 import sagas from './sagas'
 
-export default ({ coreSagas }) => {
-  const sendBchSagas = sagas({ coreSagas })
+export default ({ coreSagas, networks }) => {
+  const sendBchSagas = sagas({ coreSagas, networks })
 
   return function* sendBchSaga () {
     yield takeLatest(AT.SEND_BCH_INITIALIZED, sendBchSagas.initialized)

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagas.js
@@ -5,7 +5,6 @@ import * as A from './actions'
 import * as S from './selectors'
 import { FORM } from './model'
 import { actions, model, selectors } from 'data'
-import settings from 'config'
 import {
   initialize,
   change,
@@ -23,12 +22,12 @@ export const logLocation = 'components/sendBch/sagas'
 // TODO: Check how to retrieve Bitcoin cash default fee
 export const bchDefaultFee = 4
 
-export default ({ coreSagas }) => {
+export default ({ coreSagas, networks }) => {
   const initialized = function*() {
     try {
       yield put(A.sendBchPaymentUpdated(Remote.Loading))
       let payment = coreSagas.payment.bch.create({
-        network: settings.NETWORK_BCH
+        network: networks.bch
       })
       payment = yield payment.init()
       const accountsR = yield select(
@@ -64,7 +63,7 @@ export default ({ coreSagas }) => {
       yield put(A.sendBchPaymentUpdated(Remote.Loading))
       let payment = coreSagas.payment.bch.create({
         payment: p.getOrElse({}),
-        network: settings.NETWORK_BCH
+        network: networks.bch
       })
       payment = yield payment.build()
       yield put(A.sendBchPaymentUpdated(Remote.of(payment.value())))
@@ -85,7 +84,7 @@ export default ({ coreSagas }) => {
       let p = yield select(S.getPayment)
       let payment = coreSagas.payment.bch.create({
         payment: p.getOrElse({}),
-        network: settings.NETWORK_BCH
+        network: networks.bch
       })
 
       switch (field) {
@@ -211,7 +210,7 @@ export default ({ coreSagas }) => {
     let p = yield select(S.getPayment)
     let payment = coreSagas.payment.bch.create({
       payment: p.getOrElse({}),
-      network: settings.NETWORK_BCH
+      network: networks.bch
     })
     const fromType = path(['fromType'], payment.value())
     try {

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagas.spec.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendBch/sagas.spec.js
@@ -14,14 +14,17 @@ import * as C from 'services/AlertService'
 import { actions, selectors } from 'data'
 import sendBchSagas, { logLocation, bchDefaultFee } from './sagas'
 import { promptForSecondPassword } from 'services/SagaService'
-import settings from 'config'
+import BitcoinCash from 'bitcoinforksjs-lib'
 
 jest.mock('blockchain-wallet-v4/src/redux/sagas')
 const api = {
   obtainSessionToken: jest.fn(),
   deauthorizeBrowser: jest.fn()
 }
 const coreSagas = coreSagasFactory({ api })
+const networks = {
+  bch: BitcoinCash.networks['bitcoin']
+}
 
 describe('sendBch sagas', () => {
   // Mocking Math.random() to have identical popup ids for action testing
@@ -46,7 +49,7 @@ describe('sendBch sagas', () => {
     initialized,
     firstStepSubmitClicked,
     secondStepSubmitClicked
-  } = sendBchSagas({ api, coreSagas })
+  } = sendBchSagas({ api, coreSagas, networks })
 
   const feeType = 'regular'
   const feePerByte = 1
@@ -104,7 +107,7 @@ describe('sendBch sagas', () => {
       saga.next()
       expect(coreSagas.payment.bch.create).toHaveBeenCalledTimes(1)
       expect(coreSagas.payment.bch.create).toHaveBeenCalledWith({
-        network: settings.NETWORK_BCH
+        network: networks.bch
       })
       expect(paymentMock.init).toHaveBeenCalledTimes(1)
     })
@@ -247,7 +250,7 @@ describe('sendBch sagas', () => {
       expect(coreSagas.payment.bch.create).toHaveBeenCalledTimes(1)
       expect(coreSagas.payment.bch.create).toHaveBeenCalledWith({
         payment: paymentMock,
-        network: settings.NETWORK_BCH
+        network: networks.bch
       })
     })
 
@@ -313,7 +316,7 @@ describe('sendBch sagas', () => {
       expect(coreSagas.payment.bch.create).toHaveBeenCalledTimes(1)
       expect(coreSagas.payment.bch.create).toHaveBeenCalledWith({
         payment: paymentMock,
-        network: settings.NETWORK_BCH
+        network: networks.bch
       })
     })
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendBsv/sagaRegister.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendBsv/sagaRegister.js
@@ -3,8 +3,8 @@ import * as AT from './actionTypes'
 import { actionTypes } from 'redux-form'
 import sagas from './sagas'
 
-export default ({ coreSagas }) => {
-  const sendBsvSagas = sagas({ coreSagas })
+export default ({ coreSagas, networks }) => {
+  const sendBsvSagas = sagas({ coreSagas, networks })
 
   return function* sendBsvSaga () {
     yield takeLatest(AT.SEND_BSV_INITIALIZED, sendBsvSagas.initialized)

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sendBsv/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/components/sendBsv/sagas.js
@@ -4,7 +4,6 @@ import * as A from './actions'
 import * as S from './selectors'
 import { FORM } from './model'
 import { actions, selectors } from 'data'
-import settings from 'config'
 import {
   initialize,
   change,
@@ -20,14 +19,14 @@ import { ADDRESS_TYPES } from 'blockchain-wallet-v4/src/redux/payment/btc/utils'
 export const logLocation = 'components/sendBsv/sagas'
 export const bsvDefaultFee = 4
 
-export default ({ coreSagas }) => {
+export default ({ coreSagas, networks }) => {
   const initialized = function*(action) {
     try {
       const { payload } = action
       const { index } = payload
       yield put(A.sendBsvPaymentUpdated(Remote.Loading))
       let payment = coreSagas.payment.bsv.create({
-        network: settings.NETWORK_BSV
+        network: networks.bsv
       })
       payment = yield payment.init()
       const accountsR = yield select(
@@ -63,7 +62,7 @@ export default ({ coreSagas }) => {
       yield put(A.sendBsvPaymentUpdated(Remote.Loading))
       payment = coreSagas.payment.bsv.create({
         payment,
-        network: settings.NETWORK_BSV
+        network: networks.bsv
       })
       payment = yield payment.build()
       yield put(A.sendBsvPaymentUpdated(Remote.of(payment.value())))
@@ -84,7 +83,7 @@ export default ({ coreSagas }) => {
       let payment = (yield select(S.getPayment)).getOrElse({})
       payment = coreSagas.payment.bsv.create({
         payment,
-        network: settings.NETWORK_BSV
+        network: networks.bsv
       })
 
       switch (field) {
@@ -179,7 +178,7 @@ export default ({ coreSagas }) => {
     let p = yield select(S.getPayment)
     let payment = coreSagas.payment.bsv.create({
       payment: p.getOrElse({}),
-      network: settings.NETWORK_BSV
+      network: networks.bsv
     })
     try {
       // Sign payment