From 5f2a762d4fbec62e69385149fd7a9997b7d55546 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Wed, 16 Jun 2021 17:00:08 -0700 Subject: [PATCH] feat(/v5 REST API): Using the new v5 route in bch-api --- src/address.js | 2 +- src/bch-js.js | 4 ++-- test/e2e/rate-limits/anonymous-rate-limits.js | 6 +++--- test/e2e/rate-limits/basic-auth-rate-limits.js | 6 +++--- test/e2e/rate-limits/free-rate-limits.js | 4 ++-- test/e2e/rate-limits/full-node-rate-limits.js | 8 ++++---- test/e2e/rate-limits/indexer-rate-limits.js | 6 +++--- test/integration/chains/testnet/blockchain.js | 4 ++-- test/integration/chains/testnet/control.js | 2 +- test/integration/chains/testnet/electrumx.js | 2 +- test/integration/chains/testnet/rawtransaction.js | 4 ++-- test/integration/chains/testnet/slp.js | 4 ++-- test/integration/chains/testnet/test-free-tier.sh | 2 +- test/integration/chains/testnet/util.js | 4 ++-- test/unit/slp-utils.js | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/address.js b/src/address.js index dc93bba..7aaea03 100644 --- a/src/address.js +++ b/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 diff --git a/src/bch-js.js b/src/bch-js.js index 6d3914d..b1e5f0a 100644 --- a/src/bch-js.js +++ b/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') diff --git a/test/e2e/rate-limits/anonymous-rate-limits.js b/test/e2e/rate-limits/anonymous-rate-limits.js index 5e7e619..b9ffba6 100644 --- a/test/e2e/rate-limits/anonymous-rate-limits.js +++ b/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 }) diff --git a/test/e2e/rate-limits/basic-auth-rate-limits.js b/test/e2e/rate-limits/basic-auth-rate-limits.js index 9166dc0..704dff2 100644 --- a/test/e2e/rate-limits/basic-auth-rate-limits.js +++ b/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 }) diff --git a/test/e2e/rate-limits/free-rate-limits.js b/test/e2e/rate-limits/free-rate-limits.js index 65b8573..e244942 100644 --- a/test/e2e/rate-limits/free-rate-limits.js +++ b/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 }) diff --git a/test/e2e/rate-limits/full-node-rate-limits.js b/test/e2e/rate-limits/full-node-rate-limits.js index 879bbbd..a8466d6 100644 --- a/test/e2e/rate-limits/full-node-rate-limits.js +++ b/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`) diff --git a/test/e2e/rate-limits/indexer-rate-limits.js b/test/e2e/rate-limits/indexer-rate-limits.js index 6fe7f9a..679c37b 100644 --- a/test/e2e/rate-limits/indexer-rate-limits.js +++ b/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 }) diff --git a/test/integration/chains/testnet/blockchain.js b/test/integration/chains/testnet/blockchain.js index a91b5ae..7ea77a8 100644 --- a/test/integration/chains/testnet/blockchain.js +++ b/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. diff --git a/test/integration/chains/testnet/control.js b/test/integration/chains/testnet/control.js index aee47a9..908beac 100644 --- a/test/integration/chains/testnet/control.js +++ b/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 }) diff --git a/test/integration/chains/testnet/electrumx.js b/test/integration/chains/testnet/electrumx.js index 881f2b4..842563b 100644 --- a/test/integration/chains/testnet/electrumx.js +++ b/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 }) diff --git a/test/integration/chains/testnet/rawtransaction.js b/test/integration/chains/testnet/rawtransaction.js index 966bdb5..6228e04 100644 --- a/test/integration/chains/testnet/rawtransaction.js +++ b/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. diff --git a/test/integration/chains/testnet/slp.js b/test/integration/chains/testnet/slp.js index 7428d7a..29cc622 100644 --- a/test/integration/chains/testnet/slp.js +++ b/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. diff --git a/test/integration/chains/testnet/test-free-tier.sh b/test/integration/chains/testnet/test-free-tier.sh index 1558ce2..78ade62 100755 --- a/test/integration/chains/testnet/test-free-tier.sh +++ b/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 diff --git a/test/integration/chains/testnet/util.js b/test/integration/chains/testnet/util.js index a5b1578..0fa99a1 100644 --- a/test/integration/chains/testnet/util.js +++ b/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. diff --git a/test/unit/slp-utils.js b/test/unit/slp-utils.js index b651da5..728e1fc 100644 --- a/test/unit/slp-utils.js +++ b/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')