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

Updating e2e rate limit tests

README.md

@@ -132,3 +132,5 @@ if dependencies are pulled from npm or GitHub.
 
 ## License
 [MIT](LICENSE.md)
+
+test

package.json

@@ -9,8 +9,8 @@
   "main": "src/bch-js",
   "scripts": {
     "test": "nyc mocha --timeout 30000 test/unit/",
-    "test:integration": "mocha --timeout 30000 test/integration/",
-    "test:integration:testnet": "mocha --timeout 30000 test/integration/testnet/",
+    "test:integration": "IS_USING_FREE_TIER=true mocha --timeout 30000 test/integration/",
+    "test:integration:testnet": "IS_USING_FREE_TIER=true mocha --timeout 30000 test/integration/testnet/",
     "test:integration:local": "RESTURL=http://localhost:3000/v3/ mocha --timeout 30000 test/integration",
     "test:integration:testnet:local": "RESTURL=http://localhost:4000/v3/ mocha --timeout 30000 test/integration/testnet",
     "test:integration:free": "bash test/integration/test-free-tier.sh",

src/slp/tokentype1.js

@@ -426,7 +426,7 @@ class TokenType1 {
 
       return slpSendObj
     } catch (err) {
-      console.log(err)
+      // console.log(err)
       throw err
     }
   }

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

@@ -4,6 +4,7 @@
 
   To Run Test:
   - Update the RESTURL for bch-api you want to test against.
+  - Ensure the BCHJSTOKEN environment variable is set to an empty string.
 */
 
 const assert = require("chai").assert
@@ -31,11 +32,11 @@ describe("#anonymous rate limits", () => {
 
   it("should throw error when rate limit exceeded", async () => {
     try {
-      for (let i = 0; i < 5; i++) await bchjs.Control.getNetworkInfo()
+      for (let i = 0; i < 22; i++) await bchjs.Control.getNetworkInfo()
 
-      assert.equal(true, false, "unexpected result")
+      assert.fail("Unexpected result")
     } catch (err) {
       assert.include(err.error, "Too many requests")
     }
-  }).timeout(5000)
+  }).timeout(20000)
 })

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

@@ -10,7 +10,7 @@
 const assert = require("chai").assert
 
 const JWT_TOKEN =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2YyMDIyMWMxMDAxMmFkOTQwMSIsImVtYWlsIjoiZGVtb0BkZW1vLmNvbSIsImFwaUxldmVsIjoxMCwicmF0ZUxpbWl0IjozLCJpYXQiOjE1OTA1Mjk2NzgsImV4cCI6MTU5MzEyMTY3OH0.4q5MFDCcVx0FusivJPiEIj3w8nhFG7ZV5IhJS7faUlc"
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2YyMDIyMWMxMDAxMmFkOTQwMSIsImVtYWlsIjoiZGVtb0BkZW1vLmNvbSIsImFwaUxldmVsIjoxMCwicmF0ZUxpbWl0IjozLCJpYXQiOjE2MDQ4NTQ2OTEsImV4cCI6MTYwNzQ0NjY5MX0.iwse0z0KDKHx9graCxcOwj6lSlfKQAb1zLhmjvygvts"
 
 const BCHJS = require("../../../src/bch-js")
 const bchjs = new BCHJS({
@@ -28,19 +28,6 @@ describe("#free rate limits", () => {
     assert.property(result, "balance")
   }).timeout(5000)
 
-  // it("should throw error when rate limit exceeded 3 RPM for indexer endpoints", async () => {
-  //   const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
-  //
-  //   try {
-  //     for (let i = 0; i < 5; i++) await bchjs.Blockbook.balance(addr)
-  //
-  //     assert.equal(true, false, "unexpected result")
-  //   } catch (err) {
-  //     // console.log(`err: `, err)
-  //     assert.include(err.error, "Too many requests")
-  //   }
-  // }).timeout(10000)
-
   it("should allow up to 10 RPM to indexer, then throw error", async () => {
     try {
       const addr = "bitcoincash:qrehqueqhw629p6e57994436w730t4rzasnly00ht0"
@@ -87,4 +74,15 @@ describe("#free rate limits", () => {
       assert.notInclude(err.error, 3)
     }
   }).timeout(20000)
+
+  it("should throw error when rate limit exceeded 20 RPM for indexer endpoints", async () => {
+    try {
+      for (let i = 0; i < 22; i++) await bchjs.Control.getNetworkInfo()
+
+      assert.fail("unexpected result")
+    } catch (err) {
+      // console.log(`err: `, err)
+      assert.include(err.error, "Too many requests")
+    }
+  }).timeout(20000)
 })

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

@@ -4,17 +4,17 @@
 
   To Run Test:
   - Update the restURL for bch-api you want to test against.
-  - Update the JWT_TOKEN value with a current full-node-level JWT token.
+  - Update the JWT_TOKEN value with a paid tier JWT token.
 */
 
 const assert = require("chai").assert
 
 const JWT_TOKEN =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVkYmY4MjA1YTYwODliMjliYTlhZjc1OSIsImlhdCI6MTU3MjgzMTgzOSwiZXhwIjoxNTc1NDIzODM5fQ.sFFS4AF04U2aUwmKkBIfnMQIUoygzV9UMVzzQuwctpY"
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2JmMDIyMWMxMDAxMmFkOTNmZiIsImVtYWlsIjoiY2hyaXMudHJvdXRuZXJAZ21haWwuY29tIiwiYXBpTGV2ZWwiOjQwLCJyYXRlTGltaXQiOjMsImlhdCI6MTYwMzIyNzEwNCwiZXhwIjoxNjA1ODE5MTA0fQ.CV36grzdD36Ht3BwZGHG4XU40CVDzMRw9Ars1x1r27M"
 
 const BCHJS = require("../../../src/bch-js")
 const bchjs = new BCHJS({
-  restURL: `https://api.bchjs.cash/v3/`,
+  restURL: `https://api.fullstack.cash/v3/`,
   // restURL: `http://localhost:3000/v3/`,
   apiToken: JWT_TOKEN
 })
@@ -28,21 +28,22 @@ describe("#full node rate limits", () => {
     assert.property(result, "balance")
   }).timeout(5000)
 
-  it("should throw error when rate limit exceeded 3 RPM for indexer endpoints", async () => {
-    const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
+  // CT 11/8/20: New rate limits make this test invalid.
+  // it("should throw error when rate limit exceeded 20 RPM for indexer endpoints", async () => {
+  //   const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
+  //
+  //   try {
+  //     for (let i = 0; i < 22; i++) await bchjs.Electrumx.balance(addr)
+  //
+  //     assert.fail("unexpected result")
+  //   } catch (err) {
+  //     // console.log(`err: `, err)
+  //     assert.include(err.error, "Too many requests")
+  //   }
+  // }).timeout(10000)
 
-    try {
-      for (let i = 0; i < 5; i++) await bchjs.Blockbook.balance(addr)
-
-      assert.equal(true, false, "unexpected result")
-    } catch (err) {
-      // console.log(`err: `, err)
-      assert.include(err.error, "Too many requests")
-    }
-  }).timeout(10000)
-
-  it("should allow more than 10 RPM to full node", async () => {
-    for (let i = 0; i < 20; i++) {
+  it("should allow more than 20 RPM to full node", async () => {
+    for (let i = 0; i < 22; i++) {
       const result = await bchjs.Control.getNetworkInfo()
 
       if (i === 5) {
@@ -55,10 +56,11 @@ describe("#full node rate limits", () => {
         assert.property(result, "version", "more than 10 calls allowed")
       }
     }
-  }).timeout(10000)
+  }).timeout(20000)
 
   it("should throw error for more than 100 RPM to fullnode", async () => {
     try {
+      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`)
@@ -66,5 +68,5 @@ describe("#full node rate limits", () => {
       assert.include(err.error, "Too many requests")
       assert.include(err.error, 100)
     }
-  }).timeout(30000)
+  }).timeout(45000)
 })

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

@@ -10,7 +10,7 @@
 const assert = require("chai").assert
 
 const JWT_TOKEN =
-  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2JmMDIyMWMxMDAxMmFkOTNmZiIsImVtYWlsIjoiY2hyaXMudHJvdXRuZXJAZ21haWwuY29tIiwiYXBpTGV2ZWwiOjQwLCJyYXRlTGltaXQiOjMsImlhdCI6MTU5MDQzMjIxNywiZXhwIjoxNTkzMDI0MjE3fQ.R0Euhutd5FHCxLlSzjq1TYsGjI6iua_AguWIeLK2xCU"
+  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjVlODhhY2JmMDIyMWMxMDAxMmFkOTNmZiIsImVtYWlsIjoiY2hyaXMudHJvdXRuZXJAZ21haWwuY29tIiwiYXBpTGV2ZWwiOjQwLCJyYXRlTGltaXQiOjMsImlhdCI6MTYwMzIyNzEwNCwiZXhwIjoxNjA1ODE5MTA0fQ.CV36grzdD36Ht3BwZGHG4XU40CVDzMRw9Ars1x1r27M"
 
 const BCHJS = require("../../../src/bch-js")
 const bchjs = new BCHJS({
@@ -20,8 +20,8 @@ const bchjs = new BCHJS({
 })
 
 describe("#full node rate limits", () => {
-  it("should allow more than 10 RPM to full node", async () => {
-    for (let i = 0; i < 20; i++) {
+  it("should allow more than 20 RPM to full node", async () => {
+    for (let i = 0; i < 22; i++) {
       const result = await bchjs.Control.getNetworkInfo()
 
       if (i === 5) {
@@ -34,12 +34,12 @@ describe("#full node rate limits", () => {
         assert.property(result, "version", "more than 10 calls allowed")
       }
     }
-  }).timeout(30000)
+  }).timeout(45000)
 
-  it("should allow more than 10 RPM to an indexer", async () => {
+  it("should allow more than 20 RPM to an indexer", async () => {
     const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
 
-    for (let i = 0; i < 20; i++) {
+    for (let i = 0; i < 22; i++) {
       const result = await bchjs.Blockbook.balance(addr)
 
       if (i === 5) {
@@ -52,5 +52,5 @@ describe("#full node rate limits", () => {
         assert.property(result, "balance", "more than 10 calls allowed")
       }
     }
-  }).timeout(30000)
+  }).timeout(45000)
 })

test/integration/blockbook.js

@@ -18,6 +18,10 @@ util.inspect.defaultOptions = {
 }
 
 describe(`#Blockbook`, () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe(`#Balance`, () => {
     it(`should GET balance for a single address`, async () => {
       const addr = "bitcoincash:qrdka2205f4hyukutc2g0s6lykperc8nsu5u2ddpqf"
@@ -67,21 +71,6 @@ describe(`#Blockbook`, () => {
       assert.isArray(result[0].txids)
     })
 
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.Blockbook.balance(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input address must be a string or array of strings`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const addr = []
@@ -136,21 +125,6 @@ describe(`#Blockbook`, () => {
       ])
     })
 
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.Blockbook.utxo(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input address must be a string or array of strings`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const addr = []
@@ -168,3 +142,7 @@ describe(`#Blockbook`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/blockchain.js

@@ -21,6 +21,10 @@ util.inspect.defaultOptions = {
 }
 
 describe(`#blockchain`, () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe(`#getBestBlockHash`, () => {
     it(`should GET best block hash`, async () => {
       const result = await bchjs.Blockchain.getBestBlockHash()
@@ -85,20 +89,6 @@ describe(`#blockchain`, () => {
       ])
     })
 
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const hash = 12345
-
-        await bchjs.Blockchain.getBlockHeader(hash)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        assert.include(
-          err.message,
-          `Input hash must be a string or array of strings`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const data = []
@@ -185,20 +175,6 @@ describe(`#blockchain`, () => {
         assert.include(err.error, `Transaction not in mempool`)
       }
     })
-
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const txid = 12345
-
-        await bchjs.Blockchain.getMempoolEntry(txid)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings`
-        )
-      }
-    })
   })
 
   describe(`#getTxOutProof`, () => {
@@ -224,20 +200,6 @@ describe(`#blockchain`, () => {
       assert.isArray(result)
       assert.isString(result[0])
     })
-
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const txid = 12345
-
-        await bchjs.Blockchain.getTxOutProof(txid)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings`
-        )
-      }
-    })
   })
 
   describe(`#verifyTxOutProof`, () => {
@@ -269,20 +231,6 @@ describe(`#blockchain`, () => {
       )
     })
 
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const txid = 12345
-
-        await bchjs.Blockchain.verifyTxOutProof(txid)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const data = []
@@ -329,3 +277,7 @@ describe(`#blockchain`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/control.js

@@ -8,6 +8,10 @@ const BCHJS = require("../../src/bch-js")
 const bchjs = new BCHJS()
 
 describe(`#control`, () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe(`#getNetworkInfo`, () => {
     it("should get info on the full node", async () => {
       const result = await bchjs.Control.getNetworkInfo()
@@ -17,3 +21,7 @@ describe(`#control`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/electrumx.js

@@ -7,7 +7,13 @@ const bchjs = new BCHJS()
 
 describe(`#ElectrumX`, () => {
   let sandbox
-  beforeEach(() => (sandbox = sinon.createSandbox()))
+
+  beforeEach(async () => {
+    sandbox = sinon.createSandbox()
+
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   afterEach(() => sandbox.restore())
 
   describe(`#utxo`, () => {
@@ -354,3 +360,7 @@ describe(`#ElectrumX`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/encryption.js

@@ -4,6 +4,10 @@ const BCHJS = require("../../src/bch-js")
 const bchjs = new BCHJS()
 
 describe("#Encryption", () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe("#getPubKey", () => {
     it("should get a public key", async () => {
       const addr = "bitcoincash:qpf8jv9hmqcda0502gjp7nm3g24y5h5s4unutghsxq"
@@ -29,3 +33,7 @@ describe("#Encryption", () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/ninsight.js

@@ -7,7 +7,13 @@ const bchjs = new BCHJS({ ninsightURL: "https://rest.bitcoin.com/v2" })
 
 describe(`#Ninsight`, () => {
   let sandbox
-  beforeEach(() => (sandbox = sinon.createSandbox()))
+
+  beforeEach(async () => {
+    sandbox = sinon.createSandbox()
+
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   afterEach(() => sandbox.restore())
 
   describe(`#utxo`, () => {
@@ -55,3 +61,7 @@ describe(`#Ninsight`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/openbazaar.js

@@ -8,19 +8,11 @@ const BCHJS = require("../../src/bch-js")
 const bchjs = new BCHJS()
 
 describe(`#OpenBazaar`, () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe(`#Balance`, () => {
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.OpenBazaar.balance(addr)
-        // assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(err.message, `Input address must be a string`)
-      }
-    })
-
     it(`should GET balance for a single address`, async () => {
       const addr = "bitcoincash:qqh793x9au6ehvh7r2zflzguanlme760wuzehgzjh9"
 
@@ -45,18 +37,6 @@ describe(`#OpenBazaar`, () => {
   })
 
   describe(`#utxo`, () => {
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.OpenBazaar.utxo(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(err.message, `Input address must be a string`)
-      }
-    })
-
     it(`should GET utxos for a single address`, async () => {
       const addr = "bitcoincash:qqh793x9au6ehvh7r2zflzguanlme760wuzehgzjh9"
 
@@ -76,18 +56,6 @@ describe(`#OpenBazaar`, () => {
   })
 
   describe(`#tx`, () => {
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.OpenBazaar.tx(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(err.message, `Input txid must be a string`)
-      }
-    })
-
     it(`should GET transactions for a single address`, async () => {
       const addr =
         "2b37bdb3b63dd0bca720437754a36671431a950e684b64c44ea910ea9d5297c7"
@@ -115,3 +83,7 @@ describe(`#OpenBazaar`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/price.js

@@ -3,6 +3,10 @@ const BCHJS = require("../../src/bch-js")
 const bchjs = new BCHJS()
 
 describe("#price", () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe("#current", () => {
     describe("#single currency", () => {
       it("should get current price for single currency", async () => {
@@ -31,3 +35,7 @@ describe("#price", () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/rawtransaction.js

@@ -19,6 +19,10 @@ util.inspect.defaultOptions = {
 }
 
 describe("#rawtransaction", () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe("#decodeRawTransaction", () => {
     it("should decode tx for a single hex", async () => {
       const hex =
@@ -63,21 +67,6 @@ describe("#rawtransaction", () => {
       assert.isArray(result[0].vout)
     })
 
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.RawTransactions.decodeRawTransaction(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings.`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const data = []
@@ -232,22 +221,6 @@ describe("#rawtransaction", () => {
       const result = await bchjs.RawTransactions.decodeScript(hexes)
       console.log(`result ${JSON.stringify(result, null, 2)}`)
     })
-*/
-    /*
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.RawTransactions.decodeRawTransaction(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings.`
-        )
-      }
-    })
 */
   })
 
@@ -292,21 +265,6 @@ describe("#rawtransaction", () => {
       }
     })
 
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.RawTransactions.sendRawTransaction(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input hex must be a string or array of strings`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const dataMock =
@@ -325,3 +283,7 @@ describe("#rawtransaction", () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/slp.js

@@ -24,7 +24,7 @@ describe(`#SLP`, () => {
 
   beforeEach(async () => {
     // Introduce a delay so that the BVT doesn't trip the rate limits.
-    await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
 
     bchjs = new BCHJS()
   })
@@ -466,22 +466,6 @@ describe(`#SLP`, () => {
     })
 
     describe("#balancesForAddress", () => {
-      it(`should throw an error if input is not a string or array of strings`, async () => {
-        try {
-          const address = 1234
-
-          await bchjs.SLP.Utils.balancesForAddress(address)
-
-          assert.equal(true, false, "Uh oh. Code path should not end here.")
-        } catch (err) {
-          //console.log(`Error: `, err)
-          assert.include(
-            err.message,
-            `Input address must be a string or array of strings`
-          )
-        }
-      })
-
       it(`should fetch all balances for address: simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9`, async () => {
         const balances = await bchjs.SLP.Utils.balancesForAddress(
           "simpleledger:qzv3zz2trz0xgp6a96lu4m6vp2nkwag0kvyucjzqt9"
@@ -520,19 +504,6 @@ describe(`#SLP`, () => {
     })
 
     describe("#hydrateUtxos", () => {
-      it("should throw an error if input is not an array", async () => {
-        try {
-          const utxos = 1234
-
-          await bchjs.SLP.Utils.hydrateUtxos(utxos)
-
-          assert.equal(true, false, "Uh oh. Code path should not end here.")
-        } catch (err) {
-          // console.log(`Error: `, err)
-          assert.include(err.message, `Input must be an array.`)
-        }
-      })
-
       it("should hydrate UTXOs", async () => {
         const utxos = [
           {

test/integration/test-free-tier-bchn.sh

@@ -2,6 +2,7 @@
 
 export RESTURL=https://bchn-free-main.fullstack.cash/v3/
 #export RESTURL=http://localhost:3000/v3/
+export IS_USING_FREE_TIER=true
 
 cd test/integration/bchn/
 mocha --timeout 30000 blockchain.js control.js electrumx.js ninsight.js openbazaar.js price.js rawtransaction.js slp.js util.js

test/integration/test-free-tier.sh

@@ -2,6 +2,7 @@
 
 export RESTURL=https://free-main.fullstack.cash/v3/
 #export RESTURL=http://localhost:3000/v3/
+export IS_USING_FREE_TIER=true
 
 cd test/integration/
 mocha --timeout 30000 blockchain.js control.js electrumx.js ninsight.js openbazaar.js price.js rawtransaction.js slp.js util.js

test/integration/testnet/blockbook.js

@@ -26,6 +26,10 @@ util.inspect.defaultOptions = {
 }
 
 describe(`#Blockbook`, () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe(`#Balance`, () => {
     it(`should GET balance for a single address`, async () => {
       const addr = "bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2"
@@ -165,7 +169,7 @@ describe(`#Blockbook`, () => {
         for (let i = 0; i < 25; i++)
           addr.push("bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2")
 
-        const result = await bchjs.Blockbook.utxo(addr)
+        await bchjs.Blockbook.utxo(addr)
         //console.log(`result: ${util.inspect(result)}`)
 
         assert.equal(true, false, "Unexpected result!")
@@ -176,3 +180,7 @@ describe(`#Blockbook`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/testnet/blockchain.js

@@ -12,7 +12,7 @@ const assert = chai.assert
 
 const RESTURL = process.env.RESTURL
   ? process.env.RESTURL
-  : `https://tapi.fullstack.cash/v3/`
+  : "https://tapi.fullstack.cash/v3/"
 // if (process.env.RESTURL) RESTURL = process.env.RESTURL
 
 const BCHJS = require("../../../src/bch-js")
@@ -27,11 +27,15 @@ util.inspect.defaultOptions = {
   depth: 3
 }
 
-describe(`#blockchain`, () => {
-  describe(`#getBestBlockHash`, () => {
-    it(`should GET best block hash`, async () => {
+describe("#blockchain", () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
+  describe("#getBestBlockHash", () => {
+    it("should GET best block hash", async () => {
       const result = await bchjs.Blockchain.getBestBlockHash()
-      //console.log(`result: ${util.inspect(result)}`)
+      // console.log(`result: ${util.inspect(result)}`)
 
       assert.isString(result)
       assert.equal(result.length, 64, "Specific hash length")
@@ -39,7 +43,7 @@ describe(`#blockchain`, () => {
   })
 
   describe("#getBlockHeader", () => {
-    it(`should GET block header for a single hash`, async () => {
+    it("should GET block header for a single hash", async () => {
       const hash =
         "000000000000c57178ace90210289e6b5383134c5b5306e1cdd8395176e10aaf"
 
@@ -64,7 +68,7 @@ describe(`#blockchain`, () => {
       ])
     })
 
-    it(`should GET block headers for an array of hashes`, async () => {
+    it("should GET block headers for an array of hashes", async () => {
       const hash = [
         "000000000000c57178ace90210289e6b5383134c5b5306e1cdd8395176e10aaf",
         "00000000000b7db4cbae48d852fcbef32f728014582094ad613fe12af6600ff2"
@@ -92,21 +96,7 @@ describe(`#blockchain`, () => {
       ])
     })
 
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const hash = 12345
-
-        await bchjs.Blockchain.getBlockHeader(hash)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        assert.include(
-          err.message,
-          `Input hash must be a string or array of strings`
-        )
-      }
-    })
-
-    it(`should throw error on array size rate limit`, async () => {
+    it("should throw error on array size rate limit", async () => {
       try {
         const data = []
         for (let i = 0; i < 25; i++) {
@@ -115,7 +105,7 @@ describe(`#blockchain`, () => {
           )
         }
 
-        const result = await bchjs.Blockchain.getBlockHeader(data)
+        await bchjs.Blockchain.getBlockHeader(data)
 
         // console.log(`result: ${util.inspect(result)}`)
         assert.equal(true, false, "Unexpected result!")
@@ -178,7 +168,7 @@ describe(`#blockchain`, () => {
     })
     */
 
-    it(`should throw an error if txid is not in mempool`, async () => {
+    it("should throw an error if txid is not in mempool", async () => {
       try {
         const txid =
           "1f121fb6a33f48cd426dde06aa20ce589dd97becabb835a8d33071cbf40c7d04"
@@ -187,39 +177,25 @@ describe(`#blockchain`, () => {
 
         assert.equal(true, false, "Unexpected result!")
       } catch (err) {
-        //console.log(`err: ${util.inspect(err)}`)
+        // console.log(`err: ${util.inspect(err)}`)
         assert.hasAnyKeys(err, ["error"])
-        assert.include(err.error, `Transaction not in mempool`)
-      }
-    })
-
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const txid = 12345
-
-        await bchjs.Blockchain.getMempoolEntry(txid)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings`
-        )
+        assert.include(err.error, "Transaction not in mempool")
       }
     })
   })
 
-  describe(`#getTxOutProof`, () => {
-    it(`should get single tx out proof`, async () => {
+  describe("#getTxOutProof", () => {
+    it("should get single tx out proof", async () => {
       const txid =
         "1f121fb6a33f48cd426dde06aa20ce589dd97becabb835a8d33071cbf40c7d04"
 
       const result = await bchjs.Blockchain.getTxOutProof(txid)
-      //console.log(`result: ${JSON.stringify(result, null, 2)}`)
+      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
 
       assert.isString(result)
     })
 
-    it(`should get an array of tx out proofs`, async () => {
+    it("should get an array of tx out proofs", async () => {
       const txid = [
         "1f121fb6a33f48cd426dde06aa20ce589dd97becabb835a8d33071cbf40c7d04",
         "fc4f696c0ebb3d0994b3975f57d85be75ef752b9fd52c17e361ec3be2fa3e752"
@@ -231,27 +207,13 @@ describe(`#blockchain`, () => {
       assert.isArray(result)
       assert.isString(result[0])
     })
-
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const txid = 12345
-
-        await bchjs.Blockchain.getTxOutProof(txid)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings`
-        )
-      }
-    })
   })
 
-  describe(`#verifyTxOutProof`, () => {
+  describe("#verifyTxOutProof", () => {
     const mockTxOutProof =
       "00000020ac86ce8f2bda235c0dc135d18f6a777c44b121e8f41db8a51ca65000000000000cd4de3c49337712f3a1092c47c3bf73ec2f9b1cfd289ee991ede0b6eab4df229d5b8c5dffff001d82ce005b0700000003ec55d9142eac2c1d2229e5af24898b2590c111b62e2787fa1998d3d713fd432fd557124ed758fa156a6cdc6d317d5575aec2b86dfb159c62ecb4743f28bef1cb52e7a32fbec31e367ec152fdb952f75ee75bd8575f97b394093dbb0e6c694ffc0135"
 
-    it(`should verify a single proof`, async () => {
+    it("should verify a single proof", async () => {
       const result = await bchjs.Blockchain.verifyTxOutProof(mockTxOutProof)
       // console.log(`result: ${JSON.stringify(result, null, 2)}`)
 
@@ -263,10 +225,10 @@ describe(`#blockchain`, () => {
       )
     })
 
-    it(`should verify an array of proofs`, async () => {
+    it("should verify an array of proofs", async () => {
       const proofs = [mockTxOutProof, mockTxOutProof]
       const result = await bchjs.Blockchain.verifyTxOutProof(proofs)
-      //console.log(`result: ${JSON.stringify(result, null, 2)}`)
+      // console.log(`result: ${JSON.stringify(result, null, 2)}`)
 
       assert.isArray(result)
       assert.isString(result[0])
@@ -276,21 +238,7 @@ describe(`#blockchain`, () => {
       )
     })
 
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const txid = 12345
-
-        await bchjs.Blockchain.verifyTxOutProof(txid)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings`
-        )
-      }
-    })
-
-    it(`should throw error on array size rate limit`, async () => {
+    it("should throw error on array size rate limit", async () => {
       try {
         const data = []
         for (let i = 0; i < 25; i++) data.push(mockTxOutProof)
@@ -306,3 +254,7 @@ describe(`#blockchain`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/testnet/control.js

@@ -13,6 +13,10 @@ const BCHJS = require("../../../src/bch-js")
 const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })
 
 describe(`#control`, () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe(`#getNetworkInfo`, () => {
     it("should get info on the full node", async () => {
       const result = await bchjs.Control.getNetworkInfo()
@@ -22,3 +26,7 @@ describe(`#control`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/testnet/electrumx.js

@@ -11,7 +11,13 @@ const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })
 
 describe(`#ElectrumX`, () => {
   let sandbox
-  beforeEach(() => (sandbox = sinon.createSandbox()))
+
+  beforeEach(async () => {
+    sandbox = sinon.createSandbox()
+
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   afterEach(() => sandbox.restore())
 
   describe(`#utxo`, () => {
@@ -358,3 +364,7 @@ describe(`#ElectrumX`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/testnet/ninsight.js

@@ -7,7 +7,13 @@ const bchjs = new BCHJS({ ninsightURL: "https://trest.bitcoin.com/v2" })
 
 describe(`#Ninsight`, () => {
   let sandbox
-  beforeEach(() => (sandbox = sinon.createSandbox()))
+
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+
+    sandbox = sinon.createSandbox()
+  })
+
   afterEach(() => sandbox.restore())
 
   describe(`#utxo`, () => {
@@ -63,3 +69,7 @@ describe(`#Ninsight`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/testnet/openbazaar.js

@@ -1,124 +0,0 @@
-/*
-  tests for OpenBazaar library.
-*/
-
-// Force testnet call to OB1 servers.
-process.env.NETWORK = "testnet"
-
-const chai = require("chai")
-const assert = chai.assert
-
-const RESTURL = process.env.RESTURL
-  ? process.env.RESTURL
-  : `https://tapi.fullstack.cash/v3/`
-
-const BCHJS = require("../../../src/bch-js")
-const bchjs = new BCHJS({ restURL: RESTURL, apiToken: process.env.BCHJSTOKEN })
-
-describe(`#OpenBazaar`, () => {
-  describe(`#Balance`, () => {
-    // it(`should GET balance for a single address`, async () => {
-    //   const addr = "bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2"
-    //
-    //   const result = await bchjs.OpenBazaar.balance(addr)
-    //   // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-    //
-    //   assert.hasAllKeys(result, [
-    //     "page",
-    //     "totalPages",
-    //     "itemsOnPage",
-    //     "addrStr",
-    //     "balance",
-    //     "totalReceived",
-    //     "totalSent",
-    //     "unconfirmedBalance",
-    //     "unconfirmedTxApperances",
-    //     "txApperances",
-    //     "transactions"
-    //   ])
-    //   assert.isArray(result.transactions)
-    // })
-
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.OpenBazaar.balance(addr)
-        // assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(err.message, `Input address must be a string`)
-      }
-    })
-  })
-
-  describe(`#utxo`, () => {
-    // it(`should GET utxos for a single address`, async () => {
-    //   const addr = "bchtest:qrvn2n228aa39xupcw9jw0d3fj8axxky656e4j62z2"
-    //
-    //   const result = await bchjs.OpenBazaar.utxo(addr)
-    //   // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-    //
-    //   assert.isArray(result)
-    //   assert.hasAllKeys(result[0], [
-    //     "txid",
-    //     "vout",
-    //     "amount",
-    //     "height",
-    //     "confirmations",
-    //     "satoshis"
-    //   ])
-    // })
-
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.OpenBazaar.utxo(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(err.message, `Input address must be a string`)
-      }
-    })
-  })
-
-  describe(`#tx`, () => {
-    it(`should throw an error for improper input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.OpenBazaar.tx(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(err.message, `Input txid must be a string`)
-      }
-    })
-
-    // it(`should GET transactions for a single address`, async () => {
-    //   const addr =
-    //     "ed4692f50a4553527dd26cd8674ca06a0ab2d366f3135ca3668310467ead3cbf"
-    //
-    //   const result = await bchjs.OpenBazaar.tx(addr)
-    //   // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-    //
-    //   assert.hasAnyKeys(result, [
-    //     "txid",
-    //     "version",
-    //     "vin",
-    //     "vout",
-    //     "blockhash",
-    //     "blockheight",
-    //     "confirmations",
-    //     "blocktime",
-    //     "valueOut",
-    //     "valueIn",
-    //     "fees",
-    //     "hex"
-    //   ])
-    //   assert.isArray(result.vin)
-    //   assert.isArray(result.vout)
-    // })
-  })
-})

test/integration/testnet/rawtransaction.js

@@ -26,6 +26,10 @@ util.inspect.defaultOptions = {
 }
 
 describe("#rawtransaction", () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe("#decodeRawTransaction", () => {
     it("should decode tx for a single hex", async () => {
       const hex =
@@ -70,21 +74,6 @@ describe("#rawtransaction", () => {
       assert.isArray(result[0].vout)
     })
 
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.RawTransactions.decodeRawTransaction(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings.`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const data = []
@@ -239,22 +228,6 @@ describe("#rawtransaction", () => {
       const result = await bchjs.RawTransactions.decodeScript(hexes)
       console.log(`result ${JSON.stringify(result, null, 2)}`)
     })
-*/
-    /*
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.RawTransactions.decodeRawTransaction(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings.`
-        )
-      }
-    })
 */
   })
 
@@ -299,21 +272,6 @@ describe("#rawtransaction", () => {
       }
     })
 
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const addr = 12345
-
-        await bchjs.RawTransactions.sendRawTransaction(addr)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input hex must be a string or array of strings`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const dataMock =
@@ -332,3 +290,7 @@ describe("#rawtransaction", () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/testnet/slp.js

@@ -25,7 +25,7 @@ util.inspect.defaultOptions = {
 describe(`#SLP`, () => {
   beforeEach(async () => {
     // Introduce a delay so that the BVT doesn't trip the rate limits.
-    await sleep(1000)
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
   })
 
   describe("#util", () => {
@@ -73,22 +73,6 @@ describe(`#SLP`, () => {
   })
 
   describe("#balancesForAddress", () => {
-    it(`should throw an error if input is not a string or array of strings`, async () => {
-      try {
-        const address = 1234
-
-        await bchjs.SLP.Utils.balancesForAddress(address)
-
-        assert.equal(true, false, "Uh oh. Code path should not end here.")
-      } catch (err) {
-        //console.log(`Error: `, err)
-        assert.include(
-          err.message,
-          `Input address must be a string or array of strings`
-        )
-      }
-    })
-
     it(`should fetch all balances for address: slptest:qz0kc67pm4emjyr3gaaa2wstdaykg9m4yqwlzpj3w9`, async () => {
       // Mock the call to rest.bitcoin.com
       if (process.env.TEST === "unit") {

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

@@ -2,8 +2,8 @@
 
 export RESTURL=https://free-test.fullstack.cash/v3/
 export NETWORK=testnet
-#export RESTURL=http://localhost:3000/v3/
+export IS_USING_FREE_TIER=true
 
 cd test/integration/testnet/
-mocha --timeout 30000 blockchain.js control.js electrumx.js openbazaar.js rawtransaction.js slp.js util.js
+mocha --timeout 30000 blockchain.js control.js electrumx.js rawtransaction.js slp.js util.js
 #mocha --timeout 30000 blockchain.js

test/integration/testnet/util.js

@@ -24,6 +24,10 @@ util.inspect.defaultOptions = {
 }
 
 describe(`#util`, () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe(`#validateAddress`, () => {
     it(`should return false for testnet addr on mainnet`, async () => {
       const address = `bitcoincash:qp4k8fjtgunhdr7yq30ha4peu`
@@ -82,21 +86,6 @@ describe(`#util`, () => {
       ])
     })
 
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const address = 15432
-
-        await bchjs.Util.validateAddress(address)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings.`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const dataMock = `bchtest:pq6k9969f6v6sg7a75jkru4n7wn9sknv5cztcp0dnh`
@@ -114,3 +103,7 @@ describe(`#util`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}

test/integration/util.js

@@ -17,6 +17,10 @@ util.inspect.defaultOptions = {
 }
 
 describe(`#util`, () => {
+  beforeEach(async () => {
+    if (process.env.IS_USING_FREE_TIER) await sleep(1000)
+  })
+
   describe(`#validateAddress`, () => {
     it(`should return false for testnet addr on mainnet`, async () => {
       const address = `bchtest:qqqk4y6lsl5da64sg5qc3xezmplyu5kmpyz2ysaa5y`
@@ -75,21 +79,6 @@ describe(`#util`, () => {
       ])
     })
 
-    it(`should throw an error for improper single input`, async () => {
-      try {
-        const address = 15432
-
-        await bchjs.Util.validateAddress(address)
-        assert.equal(true, false, "Unexpected result!")
-      } catch (err) {
-        //console.log(`err: `, err)
-        assert.include(
-          err.message,
-          `Input must be a string or array of strings.`
-        )
-      }
-    })
-
     it(`should throw error on array size rate limit`, async () => {
       try {
         const dataMock = `bitcoincash:qp4k8fjtgunhdr7yq30ha4peuwupzan2vcnwrmpy0z`
@@ -107,3 +96,7 @@ describe(`#util`, () => {
     })
   })
 })
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}