zcash-hackworks
/
bitcore-node-zcash
mirror of https://github.com/zcash-hackworks/bitcore-node-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bitcoind: rename exported events to rawtransaction and hashblock

This commit is contained in:
Braydon Fuller 2016-04-15 10:29:35 -04:00
parent 890b38744d
commit 69ff5423c2
4 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/services/bitcoind.md
View File

@ -297,20 +297,20 @@ node.services.bitcoind.on('block', function(blockHash) {
``` ```
For details on instantiating a bus for a node, see the [Bus Documentation](../bus.md). For details on instantiating a bus for a node, see the [Bus Documentation](../bus.md).
- Name: `bitcoind/transaction`, Arguments: `[address, address...]` - Name: `bitcoind/rawtransaction`
- Name: `bitcoind/balance`, Arguments: `[address, address...]` - Name: `bitcoind/hashblock`
**Examples:** **Examples:**
```js ```js
bus.subscribe('bitcoind/transaction', ['13FMwCYz3hUhwPcaWuD2M1U2KzfTtvLM89']); bus.subscribe('bitcoind/rawtransaction');
bus.subscribe('bitcoind/balance', ['13FMwCYz3hUhwPcaWuD2M1U2KzfTtvLM89']); bus.subscribe('bitcoind/hashblock');
bus.on('bitcoind/transaction', function(transaction) { bus.on('bitcoind/rawtransaction', function(transactionHex) {
//... //...
}); });
bus.on('bitcoind/balance', function(balance) { bus.on('bitcoind/hashblock', function(blockhashHex) {
//... //...
}); });
``` ```

24
lib/services/bitcoind.js
View File

@ -44,8 +44,8 @@ function Bitcoin(options) {
// event subscribers // event subscribers
this.subscriptions = {}; this.subscriptions = {};
this.subscriptions.transaction = []; this.subscriptions.rawtransaction = [];
this.subscriptions.block = []; this.subscriptions.hashblock = [];
// limits // limits
this.maxAddressesQuery = options.maxAddressesQuery || Bitcoin.DEFAULT_MAX_ADDRESSES_QUERY; this.maxAddressesQuery = options.maxAddressesQuery || Bitcoin.DEFAULT_MAX_ADDRESSES_QUERY;
@ -146,16 +146,16 @@ Bitcoin.prototype.getAPIMethods = function() {
Bitcoin.prototype.getPublishEvents = function() { Bitcoin.prototype.getPublishEvents = function() {
return [ return [
{ {
name: 'bitcoind/transaction', name: 'bitcoind/rawtransaction',
scope: this, scope: this,
subscribe: this.subscribe.bind(this, 'transaction'), subscribe: this.subscribe.bind(this, 'rawtransaction'),
unsubscribe: this.unsubscribe.bind(this, 'transaction') unsubscribe: this.unsubscribe.bind(this, 'rawtransaction')
}, },
{ {
name: 'bitcoind/block', name: 'bitcoind/hashblock',
scope: this, scope: this,
subscribe: this.subscribe.bind(this, 'block'), subscribe: this.subscribe.bind(this, 'hashblock'),
unsubscribe: this.unsubscribe.bind(this, 'block') unsubscribe: this.unsubscribe.bind(this, 'hashblock')
} }
]; ];
}; };
@ -352,8 +352,8 @@ Bitcoin.prototype._zmqBlockHandler = function(node, message) {
self.zmqKnownBlocks.set(id, true); self.zmqKnownBlocks.set(id, true);
self.emit('block', message); self.emit('block', message);
for (var i = 0; i < this.subscriptions.block.length; i++) { for (var i = 0; i < this.subscriptions.hashblock.length; i++) {
this.subscriptions.block[i].emit('bitcoind/block', message.toString('hex')); this.subscriptions.hashblock[i].emit('bitcoind/hashblock', message.toString('hex'));
} }
} }
@ -421,8 +421,8 @@ Bitcoin.prototype._zmqTransactionHandler = function(node, message) {
self.emit('tx', message); self.emit('tx', message);
// Notify transaction subscribers // Notify transaction subscribers
for (var i = 0; i < this.subscriptions.transaction.length; i++) { for (var i = 0; i < this.subscriptions.rawtransaction.length; i++) {
this.subscriptions.transaction[i].emit('bitcoind/transaction', message.toString('hex')); this.subscriptions.rawtransaction[i].emit('bitcoind/rawtransaction', message.toString('hex'));
} }
} }
}; };

6
regtest/node.js
View File

@ -199,9 +199,9 @@ describe('Node Functionality', function() {
var bus = node.openBus(); var bus = node.openBus();
var blockExpected; var blockExpected;
var blockReceived; var blockReceived;
bus.subscribe('bitcoind/block'); bus.subscribe('bitcoind/hashblock');
bus.on('bitcoind/block', function(data) { bus.on('bitcoind/hashblock', function(data) {
bus.unsubscribe('bitcoind/block'); bus.unsubscribe('bitcoind/hashblock');
if (blockExpected) { if (blockExpected) {
data.should.be.equal(blockExpected); data.should.be.equal(blockExpected);
done(); done();

60
test/services/bitcoind.unit.js
View File

@ -73,8 +73,8 @@ describe('Bitcoin Service', function() {
it('will set subscriptions', function() { it('will set subscriptions', function() {
var bitcoind = new BitcoinService(baseConfig); var bitcoind = new BitcoinService(baseConfig);
bitcoind.subscriptions.should.deep.equal({ bitcoind.subscriptions.should.deep.equal({
transaction: [], rawtransaction: [],
block: [] hashblock: []
}); });
}); });
}); });
@ -100,11 +100,11 @@ describe('Bitcoin Service', function() {
var events = bitcoind.getPublishEvents(); var events = bitcoind.getPublishEvents();
should.exist(events); should.exist(events);
events.length.should.equal(2); events.length.should.equal(2);
events[0].name.should.equal('bitcoind/transaction'); events[0].name.should.equal('bitcoind/rawtransaction');
events[0].scope.should.equal(bitcoind); events[0].scope.should.equal(bitcoind);
events[0].subscribe.should.be.a('function'); events[0].subscribe.should.be.a('function');
events[0].unsubscribe.should.be.a('function'); events[0].unsubscribe.should.be.a('function');
events[1].name.should.equal('bitcoind/block'); events[1].name.should.equal('bitcoind/hashblock');
events[1].scope.should.equal(bitcoind); events[1].scope.should.equal(bitcoind);
events[1].subscribe.should.be.a('function'); events[1].subscribe.should.be.a('function');
events[1].unsubscribe.should.be.a('function'); events[1].unsubscribe.should.be.a('function');
@ -116,19 +116,19 @@ describe('Bitcoin Service', function() {
var events = bitcoind.getPublishEvents(); var events = bitcoind.getPublishEvents();
events[0].subscribe('test'); events[0].subscribe('test');
bitcoind.subscribe.args[0][0].should.equal('transaction'); bitcoind.subscribe.args[0][0].should.equal('rawtransaction');
bitcoind.subscribe.args[0][1].should.equal('test'); bitcoind.subscribe.args[0][1].should.equal('test');
events[0].unsubscribe('test'); events[0].unsubscribe('test');
bitcoind.unsubscribe.args[0][0].should.equal('transaction'); bitcoind.unsubscribe.args[0][0].should.equal('rawtransaction');
bitcoind.unsubscribe.args[0][1].should.equal('test'); bitcoind.unsubscribe.args[0][1].should.equal('test');
events[1].subscribe('test'); events[1].subscribe('test');
bitcoind.subscribe.args[1][0].should.equal('block'); bitcoind.subscribe.args[1][0].should.equal('hashblock');
bitcoind.subscribe.args[1][1].should.equal('test'); bitcoind.subscribe.args[1][1].should.equal('test');
events[1].unsubscribe('test'); events[1].unsubscribe('test');
bitcoind.unsubscribe.args[1][0].should.equal('block'); bitcoind.unsubscribe.args[1][0].should.equal('hashblock');
bitcoind.unsubscribe.args[1][1].should.equal('test'); bitcoind.unsubscribe.args[1][1].should.equal('test');
}); });
}); });
@ -137,12 +137,12 @@ describe('Bitcoin Service', function() {
it('will push to subscriptions', function() { it('will push to subscriptions', function() {
var bitcoind = new BitcoinService(baseConfig); var bitcoind = new BitcoinService(baseConfig);
var emitter = {}; var emitter = {};
bitcoind.subscribe('block', emitter); bitcoind.subscribe('hashblock', emitter);
bitcoind.subscriptions.block[0].should.equal(emitter); bitcoind.subscriptions.hashblock[0].should.equal(emitter);
var emitter2 = {}; var emitter2 = {};
bitcoind.subscribe('transaction', emitter2); bitcoind.subscribe('rawtransaction', emitter2);
bitcoind.subscriptions.transaction[0].should.equal(emitter2); bitcoind.subscriptions.rawtransaction[0].should.equal(emitter2);
}); });
}); });
@ -154,19 +154,19 @@ describe('Bitcoin Service', function() {
var emitter3 = {}; var emitter3 = {};
var emitter4 = {}; var emitter4 = {};
var emitter5 = {}; var emitter5 = {};
bitcoind.subscribe('block', emitter1); bitcoind.subscribe('hashblock', emitter1);
bitcoind.subscribe('block', emitter2); bitcoind.subscribe('hashblock', emitter2);
bitcoind.subscribe('block', emitter3); bitcoind.subscribe('hashblock', emitter3);
bitcoind.subscribe('block', emitter4); bitcoind.subscribe('hashblock', emitter4);
bitcoind.subscribe('block', emitter5); bitcoind.subscribe('hashblock', emitter5);
bitcoind.subscriptions.block.length.should.equal(5); bitcoind.subscriptions.hashblock.length.should.equal(5);
bitcoind.unsubscribe('block', emitter3); bitcoind.unsubscribe('hashblock', emitter3);
bitcoind.subscriptions.block.length.should.equal(4); bitcoind.subscriptions.hashblock.length.should.equal(4);
bitcoind.subscriptions.block[0].should.equal(emitter1); bitcoind.subscriptions.hashblock[0].should.equal(emitter1);
bitcoind.subscriptions.block[1].should.equal(emitter2); bitcoind.subscriptions.hashblock[1].should.equal(emitter2);
bitcoind.subscriptions.block[2].should.equal(emitter4); bitcoind.subscriptions.hashblock[2].should.equal(emitter4);
bitcoind.subscriptions.block[3].should.equal(emitter5); bitcoind.subscriptions.hashblock[3].should.equal(emitter5);
}); });
}); });
@ -475,8 +475,8 @@ describe('Bitcoin Service', function() {
var message = new Buffer('00000000002e08fc7ae9a9aa5380e95e2adcdc5752a4a66a7d3a22466bd4e6aa', 'hex'); var message = new Buffer('00000000002e08fc7ae9a9aa5380e95e2adcdc5752a4a66a7d3a22466bd4e6aa', 'hex');
bitcoind._rapidProtectedUpdateTip = sinon.stub(); bitcoind._rapidProtectedUpdateTip = sinon.stub();
var emitter = new EventEmitter(); var emitter = new EventEmitter();
bitcoind.subscriptions.block.push(emitter); bitcoind.subscriptions.hashblock.push(emitter);
emitter.on('bitcoind/block', function(blockHash) { emitter.on('bitcoind/hashblock', function(blockHash) {
blockHash.should.equal(message.toString('hex')); blockHash.should.equal(message.toString('hex'));
done(); done();
}); });
@ -625,8 +625,8 @@ describe('Bitcoin Service', function() {
var bitcoind = new BitcoinService(baseConfig); var bitcoind = new BitcoinService(baseConfig);
var expectedBuffer = new Buffer('abcdef', 'hex'); var expectedBuffer = new Buffer('abcdef', 'hex');
var emitter = new EventEmitter(); var emitter = new EventEmitter();
bitcoind.subscriptions.transaction.push(emitter); bitcoind.subscriptions.rawtransaction.push(emitter);
emitter.on('bitcoind/transaction', function(hex) { emitter.on('bitcoind/rawtransaction', function(hex) {
hex.should.be.a('string'); hex.should.be.a('string');
hex.should.equal(expectedBuffer.toString('hex')); hex.should.equal(expectedBuffer.toString('hex'));
done(); done();
@ -638,8 +638,8 @@ describe('Bitcoin Service', function() {
var bitcoind = new BitcoinService(baseConfig); var bitcoind = new BitcoinService(baseConfig);
var expectedBuffer = new Buffer('abcdef', 'hex'); var expectedBuffer = new Buffer('abcdef', 'hex');
var emitter = new EventEmitter(); var emitter = new EventEmitter();
bitcoind.subscriptions.transaction.push(emitter); bitcoind.subscriptions.rawtransaction.push(emitter);
emitter.on('bitcoind/transaction', function() { emitter.on('bitcoind/rawtransaction', function() {
done(); done();
}); });
var node = {}; var node = {};