From 7de52afbe6063c83c06579cd94431c3aa5ee26e9 Mon Sep 17 00:00:00 2001 From: Chris Kleeschulte Date: Fri, 8 Sep 2017 14:11:25 -0400 Subject: [PATCH] Fixed reorg. --- package-lock.json | 88 ++++------------------------------------------- package.json | 7 ++-- perf/perf.js | 2 ++ regtest/reorg.js | 4 +-- 4 files changed, 14 insertions(+), 87 deletions(-) diff --git a/package-lock.json b/package-lock.json index 49b3ab4..cb90536 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "insight-api", - "version": "5.0.0-beta.3", + "version": "5.0.0-beta.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -252,92 +252,16 @@ } }, "bitcore-p2p": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/bitcore-p2p/-/bitcore-p2p-1.1.2.tgz", - "integrity": "sha1-F5J8UiE92vDLQGczMrozleQAi1Q=", + "version": "5.0.0-beta.2", + "resolved": "https://registry.npmjs.org/bitcore-p2p/-/bitcore-p2p-5.0.0-beta.2.tgz", + "integrity": "sha512-/keg4fns0NIXhfJtQL8paFAyp0IVZrig8bJYIZRLGH4Ne5sSyNHK2ZDG7Y58P3usdCeJNFiL/rntXsvguwLAnw==", "dev": true, "requires": { - "bitcore-lib": "0.14.0", + "bcoin": "github:bcoin-org/bcoin#886008a1822ce1da7fa8395ee7db4bcc1750a28a", + "bitcore-lib": "5.0.0-beta.1", "bloom-filter": "0.2.0", "buffers": "github:bitpay/node-buffers#04f4c4264e0d105db2b99b786843ed64f23230d8", "socks5-client": "0.3.6" - }, - "dependencies": { - "bitcore-lib": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/bitcore-lib/-/bitcore-lib-0.14.0.tgz", - "integrity": "sha1-IcsjWf57mXo7e3c+t9cnWuN9ZE4=", - "dev": true, - "requires": { - "bn.js": "2.0.4", - "bs58": "2.0.0", - "buffer-compare": "1.0.0", - "elliptic": "3.0.3", - "inherits": "2.0.1", - "lodash": "3.10.1" - }, - "dependencies": { - "bn.js": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-2.0.4.tgz", - "integrity": "sha1-Igp81nf38b+pNif/QZN3b+eBlIA=", - "dev": true - }, - "bs58": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/bs58/-/bs58-2.0.0.tgz", - "integrity": "sha1-crcTvtIjoKxRi72g484/SBfznrU=", - "dev": true - }, - "buffer-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-compare/-/buffer-compare-1.0.0.tgz", - "integrity": "sha1-rKp6lm6Y7un64Usxw5pfFY+zxKI=", - "dev": true - }, - "elliptic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-3.0.3.tgz", - "integrity": "sha1-hlybQgv75VAGuflp+XoNLESWZZU=", - "dev": true, - "requires": { - "bn.js": "2.0.4", - "brorand": "1.0.5", - "hash.js": "1.0.3", - "inherits": "2.0.1" - }, - "dependencies": { - "brorand": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz", - "integrity": "sha1-B7VMowKGq9Fxig4qgwgD79yb+gQ=", - "dev": true - }, - "hash.js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz", - "integrity": "sha1-EzL/ABVsCg/92CNgE9B7d6BFFXM=", - "dev": true, - "requires": { - "inherits": "2.0.1" - } - } - } - }, - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true - }, - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", - "dev": true - } - } - } } }, "bl": { diff --git a/package.json b/package.json index ccbb08a..45454ab 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "insight-api", "description": "A Bitcoin blockchain REST and web socket API service for Bitcore Node.", - "version": "5.0.0-beta.3", + "version": "5.0.0-beta.4", "repository": "git://github.com/bitpay/insight-api.git", "bugs": { "url": "https://github.com/bitpay/insight-api/issues" @@ -22,7 +22,8 @@ }, "scripts": { "test": "NODE_ENV=test mocha -R spec --recursive", - "regtest": "mocha -R spec regtest" + "regtest": "mocha -R spec regtest", + "perf": "mocha -R spec perf" }, "main": "lib", "bitcoreNode": "lib", @@ -41,7 +42,7 @@ }, "devDependencies": { "bitcoind-rpc": "^0.7.0", - "bitcore-p2p": "^1.1.2", + "bitcore-p2p": "5.0.0-beta.2", "chai": "^3.5.0", "mkdirp": "^0.5.1", "mocha": "^2.4.5", diff --git a/perf/perf.js b/perf/perf.js index 7a13e3c..8521bc9 100644 --- a/perf/perf.js +++ b/perf/perf.js @@ -12,6 +12,8 @@ var bitcore = require('bitcore-lib'); var PrivateKey = bitcore.PrivateKey; var Transaction = bitcore.Transaction; +console.log('This test takes a really long time to run, be patient.'); + var rpcConfig = { protocol: 'http', user: 'local', diff --git a/regtest/reorg.js b/regtest/reorg.js index 28ad447..1740789 100644 --- a/regtest/reorg.js +++ b/regtest/reorg.js @@ -225,7 +225,7 @@ describe('Reorg', function() { var msg = messages.Inventory([inv]); tcpSocket.write(msg.toBuffer()); - // wait 2 secs until the reorg happens, if it takes any longer the test ought to fail anyway + // wait 5 secs until the reorg happens, if it takes any longer the test ought to fail anyway setTimeout(function() { var error; var request = http.request('http://localhost:53001/api/block/' + reorgBlock.rhash(), function(res) { @@ -267,7 +267,7 @@ describe('Reorg', function() { request.write(''); request.end(); - }, 2000); + }, 5000); }, 2000);