From 7f5c509254ac4c39d1fdcb26250a258dadcaec7b Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Tue, 21 Jul 2015 13:47:25 -0400
Subject: [PATCH] Update tests to pass network option with regtest option.

---
 lib/node.js       | 31 +++++++++++++-----
 test/node.unit.js | 80 +++++++++++++++++++++++++++++++++--------------
 2 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/lib/node.js b/lib/node.js
index decc99e6..1c0ef8dd 100644
--- a/lib/node.js
+++ b/lib/node.js
@@ -74,7 +74,7 @@ Node.prototype._loadBitcoinConf = function(config) {
 Node.prototype._loadBitcoind = function(config) {
   var bitcoindConfig = {};
   bitcoindConfig.datadir = config.datadir;
-  bitcoindConfig.testnet = config.testnet;
+  bitcoindConfig.network = config.network;
 
   // start the bitcoind daemon
   this.bitcoind = daemon(bitcoindConfig);
@@ -117,11 +117,23 @@ Node.prototype._syncBitcoind = function() {
 };
 
 Node.prototype._loadNetwork = function(config) {
-  if (config.network) {
-    Networks.add(config.network);
-    this.network = Networks.get(config.network.name);
-  } else if (config.testnet) {
+  if (config.network === 'testnet') {
     this.network = Networks.get('testnet');
+  } else if (config.network === 'regtest') {
+    Networks.remove(Networks.testnet);
+    Networks.add({
+      name: 'regtest',
+      alias: 'regtest',
+      pubkeyhash: 0x6f,
+      privatekey: 0xef,
+      scripthash: 0xc4,
+      xpubkey: 0x043587cf,
+      xprivkey: 0x04358394,
+      networkMagic: 0xfabfb5da,
+      port: 18444,
+      dnsSeeds: [ ]
+    });
+    this.network = Networks.get('regtest');
   } else {
     this.network = Networks.get('livenet');
   }
@@ -142,11 +154,14 @@ Node.prototype._loadDB = function(config) {
   // based on the network configuration and the datadir
   $.checkArgument(config.datadir, 'Please specify "datadir" in configuration options');
   $.checkState(this.network, 'Network property not defined');
+  var regtest = Networks.get('regtest');
   var datadir = config.datadir.replace(/^~/, process.env.HOME);
-  if (this.network === Networks.testnet) {
-    config.db.path = datadir + '/testnet3/bitcoindjs.db';
-  } else if (this.network === Networks.livenet) {
+  if (this.network === Networks.livenet) {
     config.db.path = datadir + '/bitcoindjs.db';
+  } else if (this.network === Networks.testnet) {
+    config.db.path = datadir + '/testnet3/bitcoindjs.db';
+  } else if (this.network === regtest) {
+    config.db.path = datadir + '/regtest/bitcoindjs.db';
   } else {
     throw new Error('Unknown network: ' + this.network);
   }
diff --git a/test/node.unit.js b/test/node.unit.js
index 5d607681..1660836e 100644
--- a/test/node.unit.js
+++ b/test/node.unit.js
@@ -168,38 +168,24 @@ describe('Bitcoind Node', function() {
     });
   });
   describe('#_loadNetwork', function() {
-    it('should add the network that was listed in the config', function() {
-      var config = {
-        network: {
-          name: 'chainlib',
-          alias: 'chainlib',
-          pubkeyhash: 0x1c,
-          privatekey: 0x1e,
-          scripthash: 0x28,
-          xpubkey: 0x02e8de8f,
-          xprivkey: 0x02e8da54,
-          networkMagic: 0x0c110907,
-          port: 9333
-        }
-      };
-      var node = new Node(config);
-      node._loadNetwork(config);
-      var network = Networks.get('chainlib');
-      should.exist(network);
-      node.network.name.should.equal('chainlib');
-    });
     it('should use the testnet network if testnet is specified', function() {
       var config = {
-        testnet: true
+        network: 'testnet'
       };
-
       var node = new Node(config);
       node._loadNetwork(config);
       node.network.name.should.equal('testnet');
     });
+    it('should use the regtest network if regtest is specified', function() {
+      var config = {
+        network: 'regtest'
+      };
+      var node = new Node(config);
+      node._loadNetwork(config);
+      node.network.name.should.equal('regtest');
+    });
     it('should use the livenet network if nothing is specified', function() {
       var config = {};
-
       var node = new Node(config);
       node._loadNetwork(config);
       node.network.name.should.equal('livenet');
@@ -245,6 +231,54 @@ describe('Bitcoind Node', function() {
         node._loadDB(config);
       }).should.throw('Unknown network');
     });
+    it('should load the db with regtest', function() {
+      var DB = function(config) {
+        config.path.should.equal(process.env.HOME + '/.bitcoin/regtest/bitcoindjs.db');
+      };
+      var config = {
+        DB: DB,
+        datadir: '~/.bitcoin'
+      };
+
+      var node = new Node(config);
+      // Switch to use regtest
+      Networks.remove(Networks.testnet);
+      Networks.add({
+        name: 'regtest',
+        alias: 'regtest',
+        pubkeyhash: 0x6f,
+        privatekey: 0xef,
+        scripthash: 0xc4,
+        xpubkey: 0x043587cf,
+        xprivkey: 0x04358394,
+        networkMagic: 0xfabfb5da,
+        port: 18444,
+        dnsSeeds: [ ]
+      });
+      var regtest = Networks.get('regtest');
+      node.network = regtest;
+      node._loadDB(config);
+      node.db.should.be.instanceof(DB);
+      Networks.remove(regtest);
+      // Add testnet back
+      Networks.add({
+        name: 'testnet',
+        alias: 'testnet',
+        pubkeyhash: 0x6f,
+        privatekey: 0xef,
+        scripthash: 0xc4,
+        xpubkey: 0x043587cf,
+        xprivkey: 0x04358394,
+        networkMagic: 0x0b110907,
+        port: 18333,
+        dnsSeeds: [
+          'testnet-seed.bitcoin.petertodd.org',
+          'testnet-seed.bluematt.me',
+          'testnet-seed.alexykot.me',
+          'testnet-seed.bitcoin.schildbach.de'
+        ]
+      });
+    });
   });
   describe('#_loadP2P', function() {
     it('should load p2p', function() {