From e4c5128fd8124ba74dbf897ad22d897139ecd78b Mon Sep 17 00:00:00 2001
From: junderw <junderwood@bitcoinbank.co.jp>
Date: Sat, 15 Jun 2019 19:36:44 +0900
Subject: [PATCH] Use regtest-client

---
 package-lock.json            |   9 ++
 package.json                 |   1 +
 test/integration/_regtest.js | 155 +----------------------------------
 3 files changed, 14 insertions(+), 151 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d769ef5..fc2d9cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1493,6 +1493,15 @@
         "read-pkg": "^3.0.0"
       }
     },
+    "regtest-client": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/regtest-client/-/regtest-client-0.1.0.tgz",
+      "integrity": "sha512-qTy+VvEKx8NRxSCr1jr+l9d+DeF06lxxWU9kmS8+kRVtgWHBTZYgQwRN6KkVqBGYP1Vls6dlG9X874WWTEurSQ==",
+      "dev": true,
+      "requires": {
+        "dhttp": "^3.0.3"
+      }
+    },
     "release-zalgo": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
diff --git a/package.json b/package.json
index b8ec5f3..7c18d24 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
     "nyc": "^14.1.1",
     "prettier": "1.16.4",
     "proxyquire": "^2.0.1",
+    "regtest-client": "0.1.0",
     "rimraf": "^2.6.3",
     "tslint": "^5.16.0",
     "typescript": "3.2.2"
diff --git a/test/integration/_regtest.js b/test/integration/_regtest.js
index 30b868c..02913a8 100644
--- a/test/integration/_regtest.js
+++ b/test/integration/_regtest.js
@@ -1,156 +1,9 @@
-const assert = require('assert')
-const bitcoin = require('../../')
-const dhttpCallback = require('dhttp/200')
-// use Promises
-const dhttp = options => new Promise((resolve, reject) => {
-  return dhttpCallback(options, (err, data) => {
-    if (err) return reject(err)
-    else return resolve(data)
-  })
-})
+const { RegtestUtils } = require('regtest-client')
 
+const bitcoin = require('../..')
 const APIPASS = process.env.APIPASS || 'satoshi'
 const APIURL = process.env.APIURL || 'https://regtest.bitbank.cc/1'
-const NETWORK = bitcoin.networks.testnet
 
-function broadcast (txHex) {
-  return dhttp({
-    method: 'POST',
-    url: APIURL + '/t/push',
-    body: txHex
-  })
-}
+const regtestUtils = new RegtestUtils(bitcoin, { APIPASS, APIURL })
 
-function mine (count) {
-  return dhttp({
-    method: 'POST',
-    url: APIURL + '/r/generate?count=' + count + '&key=' + APIPASS
-  })
-}
-
-function height () {
-  return dhttp({
-    method: 'GET',
-    url: APIURL + '/b/best/height'
-  })
-}
-
-function _faucetRequest (address, value) {
-  return dhttp({
-    method: 'POST',
-    url: APIURL + '/r/faucet?address=' + address + '&value=' + value + '&key=' + APIPASS
-  })
-}
-
-async function faucet (address, value) {
-  let count = 0
-  let _unspents = []
-  const sleep = ms => new Promise((resolve, reject) => setTimeout(resolve, ms))
-  const randInt = (min, max) => min + Math.floor((max - min + 1) * Math.random())
-  while (_unspents.length === 0) {
-    if (count > 0) {
-      if (count >= 5) throw new Error('Missing Inputs')
-      console.log('Missing Inputs, retry #' + count)
-      await sleep(randInt(150, 250))
-    }
-
-    const txId = await _faucetRequest(address, value)
-      .then(
-        v => v, // Pass success value as is
-        async err => {
-          // Bad Request error is fixed by making sure height is >= 432
-          const currentHeight = await height()
-          if (err.message === 'Bad Request' && currentHeight < 432) {
-            await mine(432 - currentHeight)
-            return _faucetRequest(address, value)
-          } else if (err.message === 'Bad Request' && currentHeight >= 432) {
-            return _faucetRequest(address, value)
-          } else {
-            throw err
-          }
-        }
-      )
-
-    await sleep(randInt(10, 40))
-
-    const results = await unspents(address)
-
-    _unspents = results.filter(x => x.txId === txId)
-
-    count++
-  }
-
-  return _unspents.pop()
-}
-
-async function faucetComplex (output, value) {
-  const keyPair = bitcoin.ECPair.makeRandom({ network: NETWORK })
-  const p2pkh = bitcoin.payments.p2pkh({ pubkey: keyPair.publicKey, network: NETWORK })
-
-  const unspent = await faucet(p2pkh.address, value * 2)
-
-  const txvb = new bitcoin.TransactionBuilder(NETWORK)
-  txvb.addInput(unspent.txId, unspent.vout, null, p2pkh.output)
-  txvb.addOutput(output, value)
-  txvb.sign({
-    prevOutScriptType: 'p2pkh',
-    vin: 0,
-    keyPair
-  })
-  const txv = txvb.build()
-
-  await broadcast(txv.toHex())
-
-  return {
-    txId: txv.getId(),
-    vout: 0,
-    value
-  }
-}
-
-function fetch (txId) {
-  return dhttp({
-    method: 'GET',
-    url: APIURL + '/t/' + txId + '/json'
-  })
-}
-
-function unspents (address) {
-  return dhttp({
-    method: 'GET',
-    url: APIURL + '/a/' + address + '/unspents'
-  })
-}
-
-async function verify (txo) {
-  const tx = await fetch(txo.txId)
-
-  const txoActual = tx.outs[txo.vout]
-  if (txo.address) assert.strictEqual(txoActual.address, txo.address)
-  if (txo.value) assert.strictEqual(txoActual.value, txo.value)
-}
-
-function getAddress (node, network) {
-  return bitcoin.payments.p2pkh({ pubkey: node.publicKey, network }).address
-}
-
-function randomAddress () {
-  return getAddress(bitcoin.ECPair.makeRandom({
-    network: bitcoin.networks.testnet
-  }), bitcoin.networks.testnet)
-}
-
-module.exports = {
-  broadcast,
-  dhttp,
-  faucet,
-  faucetComplex,
-  fetch,
-  height,
-  mine,
-  network: NETWORK,
-  unspents,
-  verify,
-  randomAddress,
-  RANDOM_ADDRESS: randomAddress()
-}
+module.exports = regtestUtils;