Merge pull request #152 from Permissionless-Software-Foundation/ct-unstable

fix(testnet): Fixing testnet integration test

package.json

@@ -11,19 +11,19 @@
   "scripts": {
     "test": "nyc mocha --trace-warnings --unhandled-rejections=strict --timeout 30000 test/unit/",
     "test:integration": "npm run test:integration:bchn",
-    "test:integration:nft": "export RESTURL=https://bchn.fullstack.cash/v4/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 -g '#nft1' test/integration/chains/bchn/slp.js",
-    "test:integration:abc": "export RESTURL=https://abc.fullstack.cash/v4/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/abc/",
-    "test:integration:bchn": "export RESTURL=https://bchn.fullstack.cash/v4/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/bchn/",
+    "test:integration:nft": "export RESTURL=https://bchn.fullstack.cash/v5/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 -g '#nft1' test/integration/chains/bchn/slp.js",
+    "test:integration:abc": "export RESTURL=https://abc.fullstack.cash/v5/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/abc/",
+    "test:integration:bchn": "export RESTURL=https://bchn.fullstack.cash/v5/ && export IS_USING_FREE_TIER=true && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/bchn/",
     "test:integration:testnet": "IS_USING_FREE_TIER=true mocha --timeout 30000 test/integration/chains/testnet/",
-    "test:integration:local:abc": "export RESTURL=http://localhost:3000/v4/ && mocha --timeout 30000 test/integration && mocha --timeout 30000 test/integration/chains/abc/",
-    "test:integration:local:bchn": "export RESTURL=http://localhost:3000/v4/ && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/bchn/",
-    "test:integration:local:testnet": "RESTURL=http://localhost:4000/v4/ mocha --timeout 30000 test/integration/chains/testnet",
-    "test:integration:decatur:bchn": "export RESTURL=http://192.168.0.36:3000/v4/ && mocha --timeout 30000 test/integration/",
-    "test:integration:temp:bchn": "export RESTURL=http://157.90.174.219:3000/v4/ && mocha --timeout 30000 test/integration/",
-    "test:temp": "export RESTURL=http://localhost:3000/v4/ && mocha --timeout 30000 -g '#Encryption' test/integration/",
+    "test:integration:local:abc": "export RESTURL=http://localhost:3000/v5/ && mocha --timeout 30000 test/integration && mocha --timeout 30000 test/integration/chains/abc/",
+    "test:integration:local:bchn": "export RESTURL=http://localhost:3000/v5/ && mocha --timeout 30000 test/integration/ && mocha --timeout 30000 test/integration/chains/bchn/",
+    "test:integration:local:testnet": "RESTURL=http://localhost:4000/v5/ mocha --timeout 30000 test/integration/chains/testnet",
+    "test:integration:decatur:bchn": "export RESTURL=http://192.168.0.36:3000/v5/ && mocha --timeout 30000 test/integration/",
+    "test:integration:temp:bchn": "export RESTURL=http://157.90.174.219:3000/v5/ && mocha --timeout 30000 test/integration/",
+    "test:temp": "export RESTURL=http://localhost:3000/v5/ && mocha --timeout 30000 -g '#Encryption' test/integration/",
     "test:temp2": "mocha --timeout=30000 -g '#TransactionLib' test/unit/",
-    "test:temp3": "export RESTURL=https://bchn.fullstack.cash/v4/ && mocha --timeout 30000 -g '#Transaction' test/integration/",
-    "test:temp4": "export RESTURL=http://localhost:3000/v4/ && mocha --timeout 30000 -g '#decodeOpReturn' test/integration/",
+    "test:temp3": "export RESTURL=https://bchn.fullstack.cash/v5/ && mocha --timeout 30000 -g '#Transaction' test/integration/",
+    "test:temp4": "export RESTURL=http://localhost:3000/v5/ && mocha --timeout 30000 -g '#decodeOpReturn' test/integration/",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "coverage:report": "nyc --reporter=html mocha --timeout 25000 test/unit/",
     "docs": "./node_modules/.bin/apidoc -i src/ -o docs",

src/address.js

@@ -6,7 +6,7 @@ const coininfo = require('@psf/coininfo')
 class Address {
   constructor (config) {
     const tmp = {}
-    if (!config || !config.restURL) tmp.restURL = 'https://api.bchjs.cash/v4/'
+    if (!config || !config.restURL) tmp.restURL = 'https://api.bchjs.cash/v5/'
     else tmp.restURL = config.restURL
 
     this.restURL = tmp.restURL

src/bch-js.js

@@ -7,8 +7,8 @@
 */
 
 // bch-api mainnet.
-const DEFAULT_REST_API = 'https://api.fullstack.cash/v4/'
-// const DEFAULT_REST_API = "http://localhost:3000/v4/"
+const DEFAULT_REST_API = 'https://api.fullstack.cash/v5/'
+// const DEFAULT_REST_API = "http://localhost:3000/v5/"
 
 // local deps
 const BitcoinCash = require('./bitcoincash')

test/e2e/rate-limits/anonymous-rate-limits.js

@@ -14,9 +14,9 @@
 
 const assert = require('chai').assert
 
-// const RESTURL = `https://abc.fullstack.cash/v4/`
-const RESTURL = 'https://bchn.fullstack.cash/v4/'
-// const RESTURL = `http://localhost:3000/v4/`
+// const RESTURL = `https://abc.fullstack.cash/v5/`
+const RESTURL = 'https://bchn.fullstack.cash/v5/'
+// const RESTURL = `http://localhost:3000/v5/`
 
 const BCHJS = require('../../../src/bch-js')
 const bchjs = new BCHJS({ restURL: RESTURL })

test/e2e/rate-limits/basic-auth-rate-limits.js

@@ -13,9 +13,9 @@ const PRO_PASS = 'testpassword'
 
 const BCHJS = require('../../../src/bch-js')
 const bchjs = new BCHJS({
-  // restURL: `https://bchn.fullstack.cash/v4/`,
-  restURL: 'https://abc.fullstack.cash/v4/',
-  // restURL: `http://localhost:3000/v4/`,
+  // restURL: `https://bchn.fullstack.cash/v5/`,
+  restURL: 'https://abc.fullstack.cash/v5/',
+  // restURL: `http://localhost:3000/v5/`,
   authPass: PRO_PASS
 })
 

test/e2e/rate-limits/free-rate-limits.js

@@ -18,8 +18,8 @@ const JWT_TOKEN =
 
 const BCHJS = require('../../../src/bch-js')
 const bchjs = new BCHJS({
-  restURL: 'https://api.fullstack.cash/v4/',
-  // restURL: `http://localhost:3000/v4/`,
+  restURL: 'https://api.fullstack.cash/v5/',
+  // restURL: `http://localhost:3000/v5/`,
   apiToken: JWT_TOKEN
 })
 

test/e2e/rate-limits/full-node-rate-limits.js

@@ -18,9 +18,9 @@ const JWT_TOKEN =
 
 const BCHJS = require('../../../src/bch-js')
 const bchjs = new BCHJS({
-  // restURL: `https://bchn.fullstack.cash/v4/`,
-  restURL: 'https:/abc.fullstack.cash/v4/',
-  // restURL: `http://localhost:3000/v4/`,
+  // restURL: `https://bchn.fullstack.cash/v5/`,
+  restURL: 'https:/abc.fullstack.cash/v5/',
+  // restURL: `http://localhost:3000/v5/`,
   apiToken: JWT_TOKEN
 })
 
@@ -65,7 +65,7 @@ describe('#full node rate limits', () => {
 
   it('should throw error for more than 100 RPM to fullnode', async () => {
     try {
-      console.log('This test usually doesn\'t pass, because of latency.')
+      console.log("This test usually doesn't pass, because of latency.")
       for (let i = 0; i < 100; i++) await bchjs.Control.getNetworkInfo()
     } catch (err) {
       // console.log(`validating after 10th call`)

test/e2e/rate-limits/indexer-rate-limits.js

@@ -14,9 +14,9 @@ const JWT_TOKEN =
 
 const BCHJS = require('../../../src/bch-js')
 const bchjs = new BCHJS({
-  // restURL: `https://bchn.fullstack.cash/v4/`,
-  restURL: 'https://abc.fullstack.cash/v4/',
-  // restURL: `http://localhost:3000/v4/`,
+  // restURL: `https://bchn.fullstack.cash/v5/`,
+  restURL: 'https://abc.fullstack.cash/v5/',
+  // restURL: `http://localhost:3000/v5/`,
   apiToken: JWT_TOKEN
 })
 

test/integration/chains/testnet/blockchain.js

@@ -12,11 +12,11 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : 'https://testnet3.fullstack.cash/v4/'
+  : 'https://testnet3.fullstack.cash/v5/'
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require('../../../../src/bch-js')
-// const bchjs = new BCHJS({ restURL: `https://testnet.bchjs.cash/v4/` })
+// const bchjs = new BCHJS({ restURL: `https://testnet.bchjs.cash/v5/` })
 const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })
 
 // Inspect utility used for debugging.

test/integration/chains/testnet/control.js

@@ -7,7 +7,7 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : 'https://testnet3.fullstack.cash/v4/'
+  : 'https://testnet3.fullstack.cash/v5/'
 
 const BCHJS = require('../../../../src/bch-js')
 const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })

test/integration/chains/testnet/electrumx.js

@@ -5,7 +5,7 @@ const util = require('util')
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : 'https://testnet3.fullstack.cash/v4/'
+  : 'https://testnet3.fullstack.cash/v5/'
 
 const BCHJS = require('../../../../src/bch-js')
 const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })
@@ -68,7 +68,9 @@ describe('#ElectrumX', () => {
     it('should throw error on array size rate limit', async () => {
       try {
         const addr = []
-        for (let i = 0; i < 25; i++) { addr.push('bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2') }
+        for (let i = 0; i < 25; i++) {
+          addr.push('bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2')
+        }
 
         // const result = await bchjs.Electrumx.utxo(addr)
         // console.log(`result: ${util.inspect(result)}`)
@@ -121,7 +123,9 @@ describe('#ElectrumX', () => {
     it('should throw error on array size rate limit', async () => {
       try {
         const addr = []
-        for (let i = 0; i < 25; i++) { addr.push('bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2') }
+        for (let i = 0; i < 25; i++) {
+          addr.push('bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2')
+        }
 
         const result = await bchjs.Electrumx.balance(addr)
 
@@ -175,7 +179,9 @@ describe('#ElectrumX', () => {
     it('should throw error on array size rate limit', async () => {
       try {
         const addr = []
-        for (let i = 0; i < 25; i++) { addr.push('bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2') }
+        for (let i = 0; i < 25; i++) {
+          addr.push('bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2')
+        }
 
         const result = await bchjs.Electrumx.transactions(addr)
 
@@ -236,7 +242,9 @@ describe('#ElectrumX', () => {
     it('should throw error on array size rate limit', async () => {
       try {
         const addr = []
-        for (let i = 0; i < 25; i++) { addr.push('bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2') }
+        for (let i = 0; i < 25; i++) {
+          addr.push('bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2')
+        }
 
         await bchjs.Electrumx.unconfirmed(addr)
         // console.log(`result: ${util.inspect(result)}`)
@@ -355,7 +363,7 @@ describe('#ElectrumX', () => {
         assert.property(err, 'success')
         assert.equal(err.success, false)
         assert.include(
-          err.error,
+          err.error.error,
           'the transaction was rejected by network rules'
         )
       }

test/integration/chains/testnet/rawtransaction.js

@@ -10,11 +10,11 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : 'https://testnet3.fullstack.cash/v4/'
+  : 'https://testnet3.fullstack.cash/v5/'
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require('../../../../src/bch-js')
-// const bchjs = new BCHJS({ restURL: `https://testnet.bchjs.cash/v4/` })
+// const bchjs = new BCHJS({ restURL: `https://testnet.bchjs.cash/v5/` })
 const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })
 
 // Inspect utility used for debugging.

test/integration/chains/testnet/slp.js

@@ -7,11 +7,11 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : 'https://testnet3.fullstack.cash/v4/'
+  : 'https://testnet3.fullstack.cash/v5/'
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require('../../../../src/bch-js')
-// const bchjs = new BCHJS({ restURL: `https://testnet.bchjs.cash/v4/` })
+// const bchjs = new BCHJS({ restURL: `https://testnet.bchjs.cash/v5/` })
 const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })
 
 // Inspect utility used for debugging.

test/integration/chains/testnet/test-free-tier.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export RESTURL=https://free-test.fullstack.cash/v4/
+export RESTURL=https://free-test.fullstack.cash/v5/
 export NETWORK=testnet
 export IS_USING_FREE_TIER=true
 

test/integration/chains/testnet/util.js

@@ -8,11 +8,11 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : 'https://testnet3.fullstack.cash/v4/'
+  : 'https://testnet3.fullstack.cash/v5/'
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require('../../../../src/bch-js')
-// const bchjs = new BCHJS({ restURL: `https://testnet.bchjs.cash/v4/` })
+// const bchjs = new BCHJS({ restURL: `https://testnet.bchjs.cash/v5/` })
 const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })
 
 // Inspect utility used for debugging.

test/integration/electrumx.js

@@ -359,10 +359,12 @@ describe('#ElectrumX', () => {
       try {
         await bchjs.Electrumx.broadcast(txHex)
       } catch (err) {
+        // console.log('err: ', err)
+
         assert.property(err, 'success')
         assert.equal(err.success, false)
         assert.include(
-          err.error,
+          err.error.error,
           'the transaction was rejected by network rules'
         )
       }

test/unit/slp-utils.js

@@ -10,7 +10,7 @@ let uut
 
 const REST_URL = process.env.RESTURL
   ? process.env.RESTURL
-  : 'https://bchn.fullstack.cash/v4/'
+  : 'https://bchn.fullstack.cash/v5/'
 
 // Mock data used for unit tests
 const mockDataLib = require('./fixtures/slp/mock-utils')