From 3cc5ce16b934fb47d00a21104aef92bf26567067 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Thu, 6 Oct 2016 02:25:15 -0700 Subject: [PATCH] http/miner: misc fixes. --- lib/http/client.js | 7 +------ lib/miner/miner.js | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/http/client.js b/lib/http/client.js index c8527a66..87ac291d 100644 --- a/lib/http/client.js +++ b/lib/http/client.js @@ -107,12 +107,7 @@ HTTPClient.prototype._open = co(function* _open() { }); this.socket.on('wallet balance', function(balance) { - self.emit('balance', { - id: balance.id, - confirmed: utils.satoshi(balance.confirmed), - unconfirmed: utils.satoshi(balance.unconfirmed), - total: utils.satoshi(balance.total) - }); + self.emit('balance', balance); }); yield this._onConnect(); diff --git a/lib/miner/miner.js b/lib/miner/miner.js index c66cd884..664fc01a 100644 --- a/lib/miner/miner.js +++ b/lib/miner/miner.js @@ -121,6 +121,7 @@ Miner.prototype._close = co(function* close() { */ Miner.prototype.start = co(function* start() { + var self = this; var block; assert(!this.running, 'Miner is already running.'); @@ -143,6 +144,10 @@ Miner.prototype.start = co(function* start() { if (this.stopping) break; + this.attempt.on('status', function(status) { + self.emit('status', status); + }); + try { block = yield this.attempt.mineAsync(); } catch (e) {