fixed merge conflict

src/app.js

@@ -32,7 +32,7 @@ const RawtransactionsV3 = require('./routes/v3/full-node/rawtransactions')
 const utilV3 = require('./routes/v3/util')
 const SlpV3 = require('./routes/v3/slp')
 const xpubV3 = require('./routes/v3/xpub')
-const blockbookV3 = require('./routes/v3/blockbook')
+const BlockbookV3 = require('./routes/v3/blockbook')
 const Ninsight = require('./routes/v3/ninsight')
 
 require('dotenv').config()
@@ -43,6 +43,7 @@ const controlV3 = new ControlV3()
 const miningV3 = new MiningV3()
 const rawtransactionsV3 = new RawtransactionsV3()
 const slpV3 = new SlpV3()
+const blockbookV3 = new BlockbookV3()
 
 const app = express()
 

src/routes/v3/util.js

@@ -6,7 +6,8 @@ const axios = require('axios')
 
 const routeUtils = require('./route-utils')
 const wlogger = require('../../util/winston-logging')
-const blockbook = require('./blockbook')
+const Blockbook = require('./blockbook')
+const blockbook = new Blockbook()
 
 const util = require('util')
 util.inspect.defaultOptions = { depth: 1 }
@@ -242,9 +243,7 @@ class UtilRoute {
       const fromAddr = bchjs.ECPair.toCashAddress(ecPair)
 
       // Get a balance on the public address
-      const balances = await _this.blockbook.testableComponents.balanceFromBlockbook(
-        fromAddr
-      )
+      const balances = await _this.blockbook.balanceFromBlockbook(fromAddr)
       // console.log(`balances: ${JSON.stringify(balances, null, 2)}`)
 
       // Total balance is the sum of the confirmed and unconfirmed balance.
@@ -264,9 +263,7 @@ class UtilRoute {
       }
 
       // Get all UTXOs help by the address.
-      const utxos = await _this.blockbook.testableComponents.utxosFromBlockbook(
-        fromAddr
-      )
+      const utxos = await _this.blockbook.utxosFromBlockbook(fromAddr)
       // console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`)
 
       const tokenUtxos = []