RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bitcoind: separate function for relative datadir expanding

Browse Source
This commit is contained in:
Braydon Fuller 2016-06-01 11:41:41 -04:00
parent 814576953c
commit 4d780a9d2d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/services/bitcoind.js
View File

@ -313,6 +313,15 @@ Bitcoin.prototype._parseBitcoinConf = function(configPath) {
return options; return options;
}; };
Bitcoin.prototype._expandRelativeDatadir = function() {
if (!utils.isAbsolutePath(this.options.spawn.datadir)) {
$.checkState(this.node.configPath);
$.checkState(utils.isAbsolutePath(this.node.configPath));
var baseConfigPath = path.dirname(this.node.configPath);
this.options.spawn.datadir = path.resolve(baseConfigPath, this.options.spawn.datadir);
}
};
Bitcoin.prototype._loadSpawnConfiguration = function(node) { Bitcoin.prototype._loadSpawnConfiguration = function(node) {
/* jshint maxstatements: 25 */ /* jshint maxstatements: 25 */
@ -320,12 +329,7 @@ Bitcoin.prototype._loadSpawnConfiguration = function(node) {
$.checkArgument(this.options.spawn.datadir, 'Please specify "spawn.datadir" in bitcoind config options'); $.checkArgument(this.options.spawn.datadir, 'Please specify "spawn.datadir" in bitcoind config options');
$.checkArgument(this.options.spawn.exec, 'Please specify "spawn.exec" in bitcoind config options'); $.checkArgument(this.options.spawn.exec, 'Please specify "spawn.exec" in bitcoind config options');
if (!utils.isAbsolutePath(this.options.spawn.datadir)) { this._expandRelativeDatadir();
$.checkState(this.node.configPath);
$.checkState(utils.isAbsolutePath(this.node.configPath));
var baseConfigPath = path.dirname(this.node.configPath);
this.options.spawn.datadir = path.resolve(baseConfigPath, this.options.spawn.datadir);
}
var spawnOptions = this.options.spawn; var spawnOptions = this.options.spawn;
var configPath = path.resolve(spawnOptions.datadir, './bitcoin.conf'); var configPath = path.resolve(spawnOptions.datadir, './bitcoin.conf');