From 4d780a9d2dafddbe6dfdfdfe12512d22c65c9457 Mon Sep 17 00:00:00 2001
From: Braydon Fuller <courier@braydon.com>
Date: Wed, 1 Jun 2016 11:41:41 -0400
Subject: [PATCH] bitcoind: separate function for relative datadir expanding

---
 lib/services/bitcoind.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/services/bitcoind.js b/lib/services/bitcoind.js
index 7e0e04f9..f1e21464 100644
--- a/lib/services/bitcoind.js
+++ b/lib/services/bitcoind.js
@@ -313,6 +313,15 @@ Bitcoin.prototype._parseBitcoinConf = function(configPath) {
   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) {
   /* 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.exec, 'Please specify "spawn.exec" in bitcoind config options');
 
-  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);
-  }
+  this._expandRelativeDatadir();
 
   var spawnOptions = this.options.spawn;
   var configPath = path.resolve(spawnOptions.datadir, './bitcoin.conf');