From e99803e63462d9963af62bfe66701b11dcbe3482 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Fri, 16 Oct 2015 14:59:05 -0400 Subject: [PATCH] bitcore -> bitcore-lib --- docs/pool.md | 2 +- index.js | 2 +- integration/bitcoind.js | 2 +- lib/bloomfilter.js | 2 +- lib/errors.js | 2 +- lib/inventory.js | 2 +- lib/messages/builder.js | 2 +- lib/messages/commands/addr.js | 2 +- lib/messages/commands/alert.js | 2 +- lib/messages/commands/block.js | 2 +- lib/messages/commands/filteradd.js | 2 +- lib/messages/commands/filterclear.js | 2 +- lib/messages/commands/filterload.js | 2 +- lib/messages/commands/getaddr.js | 2 +- lib/messages/commands/getblocks.js | 2 +- lib/messages/commands/getdata.js | 2 +- lib/messages/commands/getheaders.js | 2 +- lib/messages/commands/headers.js | 2 +- lib/messages/commands/inv.js | 2 +- lib/messages/commands/mempool.js | 2 +- lib/messages/commands/merkleblock.js | 2 +- lib/messages/commands/notfound.js | 2 +- lib/messages/commands/ping.js | 2 +- lib/messages/commands/pong.js | 2 +- lib/messages/commands/reject.js | 2 +- lib/messages/commands/tx.js | 2 +- lib/messages/commands/verack.js | 2 +- lib/messages/commands/version.js | 2 +- lib/messages/index.js | 2 +- lib/messages/message.js | 2 +- lib/messages/utils.js | 2 +- lib/peer.js | 2 +- lib/pool.js | 2 +- package.json | 2 +- test/bloomfilter.js | 2 +- test/inventory.js | 2 +- test/messages/builder.js | 2 +- test/messages/commands/index.js | 2 +- test/messages/index.js | 2 +- test/messages/message.js | 2 +- test/messages/util.js | 2 +- test/peer.js | 2 +- test/pool.js | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/pool.md b/docs/pool.md index fbffb82..ea81d66 100644 --- a/docs/pool.md +++ b/docs/pool.md @@ -11,7 +11,7 @@ The quickest way to get connected is to run the following: ```javascript var Pool = require('bitcore-p2p').Pool; -var Networks = require('bitcore').Networks; +var Networks = require('bitcore-lib').Networks; var pool = new Pool({network: Networks.livenet}); diff --git a/index.js b/index.js index 0111f26..de16179 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); bitcore.P2P = require('./lib'); module.exports = bitcore.P2P; diff --git a/integration/bitcoind.js b/integration/bitcoind.js index 9343fde..e24ed01 100644 --- a/integration/bitcoind.js +++ b/integration/bitcoind.js @@ -6,7 +6,7 @@ var chai = require('chai'); var should = chai.should(); var sinon = require('sinon'); -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var _ = bitcore.deps._; var Random = bitcore.crypto.Random; var BN = bitcore.crypto.BN; diff --git a/lib/bloomfilter.js b/lib/bloomfilter.js index befde2e..42d45a9 100644 --- a/lib/bloomfilter.js +++ b/lib/bloomfilter.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BloomFilter = require('bloom-filter'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/errors.js b/lib/errors.js index aa461a5..d387bee 100644 --- a/lib/errors.js +++ b/lib/errors.js @@ -5,4 +5,4 @@ var spec = { message: 'Internal Error on bitcore-p2p Module {0}' }; -module.exports = require('bitcore').errors.extend(spec); +module.exports = require('bitcore-lib').errors.extend(spec); diff --git a/lib/inventory.js b/lib/inventory.js index 42bb0fa..dd21d60 100644 --- a/lib/inventory.js +++ b/lib/inventory.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var $ = bitcore.util.preconditions; var BufferUtil = bitcore.util.buffer; var BufferReader = bitcore.encoding.BufferReader; diff --git a/lib/messages/builder.js b/lib/messages/builder.js index d17f86b..9066ac5 100644 --- a/lib/messages/builder.js +++ b/lib/messages/builder.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var Inventory = require('../inventory'); function builder(options) { diff --git a/lib/messages/commands/addr.js b/lib/messages/commands/addr.js index 609a7a9..19ba1aa 100644 --- a/lib/messages/commands/addr.js +++ b/lib/messages/commands/addr.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/alert.js b/lib/messages/commands/alert.js index 24c26a8..6c0301c 100644 --- a/lib/messages/commands/alert.js +++ b/lib/messages/commands/alert.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/block.js b/lib/messages/commands/block.js index c681f8c..7eee962 100644 --- a/lib/messages/commands/block.js +++ b/lib/messages/commands/block.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/filteradd.js b/lib/messages/commands/filteradd.js index 6ee821f..7012ce7 100644 --- a/lib/messages/commands/filteradd.js +++ b/lib/messages/commands/filteradd.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var BufferUtil = bitcore.util.buffer; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/filterclear.js b/lib/messages/commands/filterclear.js index 41e8d1d..d68693f 100644 --- a/lib/messages/commands/filterclear.js +++ b/lib/messages/commands/filterclear.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferUtil = bitcore.util.buffer; /** diff --git a/lib/messages/commands/filterload.js b/lib/messages/commands/filterload.js index fbc3d59..b8dbcae 100644 --- a/lib/messages/commands/filterload.js +++ b/lib/messages/commands/filterload.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferUtil = bitcore.util.buffer; var BloomFilter = require('../../bloomfilter'); var $ = bitcore.util.preconditions; diff --git a/lib/messages/commands/getaddr.js b/lib/messages/commands/getaddr.js index 18f0073..9d6b2ee 100644 --- a/lib/messages/commands/getaddr.js +++ b/lib/messages/commands/getaddr.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferUtil = bitcore.util.buffer; /** diff --git a/lib/messages/commands/getblocks.js b/lib/messages/commands/getblocks.js index 0e35483..266dec2 100644 --- a/lib/messages/commands/getblocks.js +++ b/lib/messages/commands/getblocks.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/getdata.js b/lib/messages/commands/getdata.js index 3a6eb0e..6108854 100644 --- a/lib/messages/commands/getdata.js +++ b/lib/messages/commands/getdata.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/getheaders.js b/lib/messages/commands/getheaders.js index d561e4c..79dec4b 100644 --- a/lib/messages/commands/getheaders.js +++ b/lib/messages/commands/getheaders.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/headers.js b/lib/messages/commands/headers.js index a61f16e..5fbd54c 100644 --- a/lib/messages/commands/headers.js +++ b/lib/messages/commands/headers.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/inv.js b/lib/messages/commands/inv.js index da4f67c..7ebf919 100644 --- a/lib/messages/commands/inv.js +++ b/lib/messages/commands/inv.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/mempool.js b/lib/messages/commands/mempool.js index fcfebc7..8a0ee79 100644 --- a/lib/messages/commands/mempool.js +++ b/lib/messages/commands/mempool.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferUtil = bitcore.util.buffer; /** diff --git a/lib/messages/commands/merkleblock.js b/lib/messages/commands/merkleblock.js index c8bc04a..e04e58e 100644 --- a/lib/messages/commands/merkleblock.js +++ b/lib/messages/commands/merkleblock.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferUtil = bitcore.util.buffer; var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/notfound.js b/lib/messages/commands/notfound.js index 31c7727..fd99c24 100644 --- a/lib/messages/commands/notfound.js +++ b/lib/messages/commands/notfound.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/ping.js b/lib/messages/commands/ping.js index 0f77cee..c616522 100644 --- a/lib/messages/commands/ping.js +++ b/lib/messages/commands/ping.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/pong.js b/lib/messages/commands/pong.js index 519b531..57af37c 100644 --- a/lib/messages/commands/pong.js +++ b/lib/messages/commands/pong.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var utils = require('../utils'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/reject.js b/lib/messages/commands/reject.js index 5dea254..5ed9543 100644 --- a/lib/messages/commands/reject.js +++ b/lib/messages/commands/reject.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferUtil = bitcore.util.buffer; // todo: add payload: https://en.bitcoin.it/wiki/Protocol_documentation#reject diff --git a/lib/messages/commands/tx.js b/lib/messages/commands/tx.js index db3eae7..1d4c46b 100644 --- a/lib/messages/commands/tx.js +++ b/lib/messages/commands/tx.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/verack.js b/lib/messages/commands/verack.js index 6260bdd..95836d5 100644 --- a/lib/messages/commands/verack.js +++ b/lib/messages/commands/verack.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferUtil = bitcore.util.buffer; /** diff --git a/lib/messages/commands/version.js b/lib/messages/commands/version.js index fb00ca7..bffe8ee 100644 --- a/lib/messages/commands/version.js +++ b/lib/messages/commands/version.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferWriter = bitcore.encoding.BufferWriter; var BufferReader = bitcore.encoding.BufferReader; var BN = bitcore.crypto.BN; diff --git a/lib/messages/index.js b/lib/messages/index.js index 8ce7f01..6e3bfdd 100644 --- a/lib/messages/index.js +++ b/lib/messages/index.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferUtil = bitcore.util.buffer; var Hash = bitcore.crypto.Hash; var $ = bitcore.util.preconditions; diff --git a/lib/messages/message.js b/lib/messages/message.js index 62feeff..3e38c7e 100644 --- a/lib/messages/message.js +++ b/lib/messages/message.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var $ = bitcore.util.preconditions; var BufferWriter = bitcore.encoding.BufferWriter; var Hash = bitcore.crypto.Hash; diff --git a/lib/messages/utils.js b/lib/messages/utils.js index eb3a975..9c27cf6 100644 --- a/lib/messages/utils.js +++ b/lib/messages/utils.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferUtil = bitcore.util.buffer; var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/peer.js b/lib/peer.js index 25a4eaa..01c0168 100644 --- a/lib/peer.js +++ b/lib/peer.js @@ -4,7 +4,7 @@ var Buffers = require('./buffers'); var EventEmitter = require('events').EventEmitter; var Net = require('net'); var Socks5Client = require('socks5-client'); -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var Networks = bitcore.Networks; var Messages = require('./messages'); var $ = bitcore.util.preconditions; diff --git a/lib/pool.js b/lib/pool.js index 2f07939..07af21e 100644 --- a/lib/pool.js +++ b/lib/pool.js @@ -2,7 +2,7 @@ var dns = require('dns'); var EventEmitter = require('events').EventEmitter; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var sha256 = bitcore.crypto.Hash.sha256; var Peer = require('./peer'); var Networks = bitcore.Networks; diff --git a/package.json b/package.json index 16b2565..c41a96c 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "url": "https://github.com/bitpay/bitcore-p2p.git" }, "dependencies": { - "bitcore": "^0.13.0", + "bitcore-lib": "^0.13.7", "bloom-filter": "^0.2.0", "buffers": "^0.1.1", "socks5-client": "^0.3.6" diff --git a/test/bloomfilter.js b/test/bloomfilter.js index ab79556..56a86d0 100644 --- a/test/bloomfilter.js +++ b/test/bloomfilter.js @@ -4,7 +4,7 @@ var chai = require('chai'); var should = chai.should(); var assert = require('assert'); -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var Data = require('./data/messages'); var P2P = require('../'); var BloomFilter = P2P.BloomFilter; diff --git a/test/inventory.js b/test/inventory.js index e269f13..7c22f4c 100644 --- a/test/inventory.js +++ b/test/inventory.js @@ -4,7 +4,7 @@ var should = require('chai').should(); -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var P2P = require('../'); var Inventory = P2P.Inventory; var BufferUtils = bitcore.util.buffer; diff --git a/test/messages/builder.js b/test/messages/builder.js index 6bfac0f..f076f5c 100644 --- a/test/messages/builder.js +++ b/test/messages/builder.js @@ -3,7 +3,7 @@ var should = require('chai').should(); var P2P = require('../../'); var builder = P2P.Messages.builder; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); describe('Messages Builder', function() { diff --git a/test/messages/commands/index.js b/test/messages/commands/index.js index 741f368..ae4d39e 100644 --- a/test/messages/commands/index.js +++ b/test/messages/commands/index.js @@ -4,7 +4,7 @@ var should = require('chai').should(); var P2P = require('../../../'); var Messages = P2P.Messages; var sinon = require('sinon'); -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); describe('Command Messages', function() { diff --git a/test/messages/index.js b/test/messages/index.js index 33d314d..f452727 100644 --- a/test/messages/index.js +++ b/test/messages/index.js @@ -7,7 +7,7 @@ var Buffers = require('buffers'); var P2P = require('../../'); var Messages = P2P.Messages; var messages = new Messages(); -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var Data = require('../data/messages'); //todo merge with commandData var commandData = require('../data/messages.json'); diff --git a/test/messages/message.js b/test/messages/message.js index 115bb90..ed1e632 100644 --- a/test/messages/message.js +++ b/test/messages/message.js @@ -3,7 +3,7 @@ var should = require('chai').should(); var P2P = require('../../'); var Message = P2P.Messages.Message; -var Networks = require('bitcore').Networks; +var Networks = require('bitcore-lib').Networks; describe('Message', function() { diff --git a/test/messages/util.js b/test/messages/util.js index 8a12064..451fc17 100644 --- a/test/messages/util.js +++ b/test/messages/util.js @@ -4,7 +4,7 @@ var should = require('chai').should(); var utils = require('../../lib/messages/utils'); -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var BufferReader = bitcore.encoding.BufferReader; describe('Message Utils', function() { diff --git a/test/peer.js b/test/peer.js index a536d2d..406eab6 100644 --- a/test/peer.js +++ b/test/peer.js @@ -10,7 +10,7 @@ var expect = chai.expect; var sinon = require('sinon'); var fs = require('fs'); -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var _ = bitcore.deps._; var P2P = require('../'); var Peer = P2P.Peer; diff --git a/test/pool.js b/test/pool.js index 8ea1663..c3f128a 100644 --- a/test/pool.js +++ b/test/pool.js @@ -6,7 +6,7 @@ var chai = require('chai'); var should = chai.should(); var expect = chai.expect; -var bitcore = require('bitcore'); +var bitcore = require('bitcore-lib'); var P2P = require('../'); var Peer = P2P.Peer; var MessagesData = require('./data/messages');