From d93fc791e3c43d8307e78fd013430c02a351f9e6 Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Thu, 28 Sep 2017 21:59:45 -0400
Subject: [PATCH] Fixed tests.

---
 lib/addresses.js   | 21 +++++++++++++--------
 lib/index.js       | 12 ++++++------
 regtest/address.js |  4 +---
 test/addresses.js  |  8 ++++----
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/lib/addresses.js b/lib/addresses.js
index 66f85cd..839397f 100644
--- a/lib/addresses.js
+++ b/lib/addresses.js
@@ -89,17 +89,22 @@ AddressController.prototype.getAddressSummary = function(address, options, callb
   });
 };
 
-AddressController.prototype.checkAddr = function(req, res, next) {
-  req.addr = req.params.addr;
-  this.check(req, res, next, [req.addr]);
-};
-
 AddressController.prototype.checkAddrs = function(req, res, next) {
 
-  if(req.body.addrs) {
-    req.addrs = req.body.addrs.split(',');
+  function makeArray(addrs) {
+    if (_.isString(addrs)) {
+      return addrs.split(',');
+    }
+    return addrs;
+  }
+
+  if (req.params.addr) {
+    req.addr = req.params.addr;
+    req.addrs = [req.addr];
+  } else if(req.body.addrs) {
+    req.addrs = makeArray(req.body.addrs);
   } else {
-    req.addrs = req.params.addrs.split(',');
+    req.addrs = makeArray(req.params.addrs);
   }
 
   if(!_.isArray(req.addrs) || _.compact(req.addrs).length < 1) {
diff --git a/lib/index.js b/lib/index.js
index 96d2b77..c541c70 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -213,18 +213,18 @@ InsightAPI.prototype.setupRoutes = function(app) {
 
   // Address routes
   var addresses = new AddressController(this.node);
-  app.get('/addr/:addr', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.show.bind(addresses));
-  app.get('/addr/:addr/utxo', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.utxo.bind(addresses));
+  app.get('/addr/:addr', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.show.bind(addresses));
+  app.get('/addr/:addr/utxo', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.utxo.bind(addresses));
   app.get('/addrs/:addrs/utxo', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multiutxo.bind(addresses));
   app.post('/addrs/utxo', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multiutxo.bind(addresses));
   app.get('/addrs/:addrs/txs', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multitxs.bind(addresses));
   app.post('/addrs/txs', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.multitxs.bind(addresses));
 
   // Address property routes
-  app.get('/addr/:addr/balance', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.balance.bind(addresses));
-  app.get('/addr/:addr/totalReceived', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.totalReceived.bind(addresses));
-  app.get('/addr/:addr/totalSent', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.totalSent.bind(addresses));
-  app.get('/addr/:addr/unconfirmedBalance', this.cacheShort(), addresses.checkAddr.bind(addresses), addresses.unconfirmedBalance.bind(addresses));
+  app.get('/addr/:addr/balance', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.balance.bind(addresses));
+  app.get('/addr/:addr/totalReceived', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.totalReceived.bind(addresses));
+  app.get('/addr/:addr/totalSent', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.totalSent.bind(addresses));
+  app.get('/addr/:addr/unconfirmedBalance', this.cacheShort(), addresses.checkAddrs.bind(addresses), addresses.unconfirmedBalance.bind(addresses));
 
   // Status route
   var status = new StatusController(this.node);
diff --git a/regtest/address.js b/regtest/address.js
index 3808818..9917a9a 100644
--- a/regtest/address.js
+++ b/regtest/address.js
@@ -414,8 +414,6 @@ describe('Address', function() {
     });
   });
 
-
-
   it('should get address info correctly: /addr/:addr', function(done) {
 
     var httpOpts = {
@@ -434,7 +432,7 @@ describe('Address', function() {
         return done(err);
       }
 
-      //console.log(data);
+      console.log(data);
       expect(data.balance).to.equal(0);
       expect(data.totalSent).to.equal(25);
       done();
diff --git a/test/addresses.js b/test/addresses.js
index b90b9bf..4fbb902 100644
--- a/test/addresses.js
+++ b/test/addresses.js
@@ -162,20 +162,20 @@ var utxos = [
   {
     'address': 'mzkD4nmQ8ixqxySdBgsXTpgvAMK5iRZpNK',
     'txid': '63b68becb0e514b32317f4b29a5cf0627d4087e54ac17f686fcb1d9a27680f73',
-    'outputIndex': 1,
+    'vout': 1,
     'timestamp': 1441116143,
     'satoshis': 53320000,
-    'script': '76a914d2ec20bb8e5f25a52f730384b803d95683250e0b88ac',
+    'scriptPubKey': '76a914d2ec20bb8e5f25a52f730384b803d95683250e0b88ac',
     'height': 534181,
     'confirmations': 50
   },
   {
     'address': 'moZY18rGNmh4YCPeugtGW46AkkWMQttBUD',
     'txid': '63b68becb0e514b32317f4b29a5cf0627d4087e54ac17f686fcb1d9a27680f73',
-    'outputIndex': 2,
+    'vout': 2,
     'timestamp': 1441116143,
     'satoshis': 289829,
-    'script': '76a914583df9fa56ad961051e00ca93e68dfaf1eab9ec588ac',
+    'scriptPubKey': '76a914583df9fa56ad961051e00ca93e68dfaf1eab9ec588ac',
     'height': 534181,
     'confirmations': 50
   }