From 87bd8fa36f5ee4753554e328154f5284bc8aa613 Mon Sep 17 00:00:00 2001 From: Sky Young Date: Mon, 30 Apr 2018 12:23:44 -0700 Subject: [PATCH] Remove bcoin --- lib/blocks.js | 3 +-- package.json | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/blocks.js b/lib/blocks.js index 0b1c4b4..aed7ac4 100644 --- a/lib/blocks.js +++ b/lib/blocks.js @@ -8,7 +8,6 @@ var _ = flocore.deps._; var pools = require('../pools.json'); var LRU = require('lru-cache'); var Common = require('./common'); -var bcoin = require('bcoin'); var JsonStream = require('JSONStream'); function BlockController(options) { @@ -209,7 +208,7 @@ BlockController.prototype._getBlockSummary = function(hash, moreTimestamp, next) return next(); } - var block = bcoin.block.fromRaw(blockBuffer, 'hex'); + var block = flocore.Block.fromRawBlock(blockBuffer); // if we don't we a block header back, this is highly unusual, // but possible if there was a very recent reorg and the header diff --git a/package.json b/package.json index b325dad..d20fb7e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "flosight-api", "description": "A Florincoin blockchain REST and web socket API service for Flocore Node.", - "version": "5.0.0-beta.45", + "version": "5.0.0-beta.47", "repository": "git://github.com/bitpay/flosight-api.git", "bugs": { "url": "https://github.com/bitpay/flosight-api/issues" @@ -30,7 +30,6 @@ "dependencies": { "JSONStream": "^1.3.1", "async": "*", - "bcoin": "bcoin-org/bcoin#886008a1822ce1da7fa8395ee7db4bcc1750a28a", "flocore-lib": "0.15.0", "flocore-message": "^1.0.3", "body-parser": "^1.13.3", @@ -42,7 +41,7 @@ }, "devDependencies": { "florincoind-rpc": "0.7.1", - "bitcore-p2p": "5.0.0-beta.2", + "flocore-p2p": "5.0.0-beta.2", "chai": "^3.5.0", "mkdirp": "^0.5.1", "mocha": "^2.4.5",