From f3f2f5961570f456e61d47ecf302bb45ed931be1 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Fri, 8 Apr 2016 16:00:33 -0400 Subject: [PATCH] node: add getNetworkName method --- lib/node.js | 8 ++++++++ lib/services/bitcoind.js | 5 +---- regtest/bitcoind.js | 5 ++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/node.js b/lib/node.js index f9c49787..4d80fc48 100644 --- a/lib/node.js +++ b/lib/node.js @@ -248,6 +248,14 @@ Node.prototype.start = function(callback) { ); }; +Node.prototype.getNetworkName = function() { + var network = this.network.name; + if (this.network.regtestEnabled) { + network = 'regtest'; + } + return network; +}; + /** * Will stop all running services in the reverse order that they * were initially started. diff --git a/lib/services/bitcoind.js b/lib/services/bitcoind.js index 30a0b968..be8ce904 100644 --- a/lib/services/bitcoind.js +++ b/lib/services/bitcoind.js @@ -1301,10 +1301,7 @@ Bitcoin.prototype.getInfo = function(callback) { return callback(self._wrapRPCError(err)); } var result = response.result; - result.network = self.node.network.name; - if (self.node.network.regtestEnabled) { - result.network = 'regtest'; - } + result.network = self.node.getNetworkName(); callback(null, result); }); }; diff --git a/regtest/bitcoind.js b/regtest/bitcoind.js index b9adf95e..8aa4d71e 100644 --- a/regtest/bitcoind.js +++ b/regtest/bitcoind.js @@ -49,7 +49,10 @@ describe('Bitcoind Functionality', function() { exec: path.resolve(__dirname, '../bin/bitcoind') }, node: { - network: regtestNetwork + network: regtestNetwork, + getNetworkName: function() { + return 'regtest'; + } } });