From ed4025bffe338c3d25f4fcc87c2d86a2fd27e725 Mon Sep 17 00:00:00 2001
From: Ian Coleman <coleman.ian@gmail.com>
Date: Thu, 27 Mar 2014 08:39:13 +1100
Subject: [PATCH] Address Properties moved to addresses controller

---
 app/controllers/addressProperties.js | 73 ----------------------------
 app/controllers/addresses.js         | 51 +++++++++++++++++++
 config/routes.js                     |  9 ++--
 3 files changed, 55 insertions(+), 78 deletions(-)
 delete mode 100644 app/controllers/addressProperties.js

diff --git a/app/controllers/addressProperties.js b/app/controllers/addressProperties.js
deleted file mode 100644
index e02ec65c..00000000
--- a/app/controllers/addressProperties.js
+++ /dev/null
@@ -1,73 +0,0 @@
-'use strict';
-
-/**
- * Module dependencies.
- */
-
-var Address = require('../models/Address'),
-    common      = require('./common');
-
-var getAddr = function(req, res, next) {
-  var a;
-  try {
-    var addr = req.param('addr');
-    a = new Address(addr);
-  } catch (e) {
-    common.handleErrors({message: 'Invalid address:' + e.message, code: 1}, res, next);
-    return null;
-  }
-  return a;
-};
-
-
-exports.balance = function(req, res, next) {
-  var a = getAddr(req, res, next);
-  if (a)
-    a.update(function(err) {
-      if (err) {
-        return common.handleErrors(err, res);
-      }
-      else  {
-        return res.jsonp(a.balanceSat);
-      }
-    });
-};
-
-exports.totalReceived = function(req, res, next) {
-  var a = getAddr(req, res, next);
-  if (a)
-    a.update(function(err) {
-      if (err) {
-        return common.handleErrors(err, res);
-      }
-      else  {
-        return res.jsonp(a.totalReceivedSat);
-      }
-    });
-};
-
-exports.totalSent = function(req, res, next) {
-  var a = getAddr(req, res, next);
-  if (a)
-    a.update(function(err) {
-      if (err) {
-        return common.handleErrors(err, res);
-      }
-      else  {
-        return res.jsonp(a.totalSentSat);
-      }
-    });
-};
-
-exports.unconfirmedBalance = function(req, res, next) {
-  var a = getAddr(req, res, next);
-  if (a)
-    a.update(function(err) {
-      if (err) {
-        return common.handleErrors(err, res);
-      }
-      else  {
-        return res.jsonp(a.unconfirmedBalanceSat);
-      }
-    });
-};
diff --git a/app/controllers/addresses.js b/app/controllers/addresses.js
index d2a90b79..ce2bfa79 100644
--- a/app/controllers/addresses.js
+++ b/app/controllers/addresses.js
@@ -51,3 +51,54 @@ exports.utxo = function(req, res, next) {
 
 
 
+exports.balance = function(req, res, next) {
+  var a = getAddr(req, res, next);
+  if (a)
+    a.update(function(err) {
+      if (err) {
+        return common.handleErrors(err, res);
+      }
+      else  {
+        return res.jsonp(a.balanceSat);
+      }
+    });
+};
+
+exports.totalReceived = function(req, res, next) {
+  var a = getAddr(req, res, next);
+  if (a)
+    a.update(function(err) {
+      if (err) {
+        return common.handleErrors(err, res);
+      }
+      else  {
+        return res.jsonp(a.totalReceivedSat);
+      }
+    });
+};
+
+exports.totalSent = function(req, res, next) {
+  var a = getAddr(req, res, next);
+  if (a)
+    a.update(function(err) {
+      if (err) {
+        return common.handleErrors(err, res);
+      }
+      else  {
+        return res.jsonp(a.totalSentSat);
+      }
+    });
+};
+
+exports.unconfirmedBalance = function(req, res, next) {
+  var a = getAddr(req, res, next);
+  if (a)
+    a.update(function(err) {
+      if (err) {
+        return common.handleErrors(err, res);
+      }
+      else  {
+        return res.jsonp(a.unconfirmedBalanceSat);
+      }
+    });
+};
diff --git a/config/routes.js b/config/routes.js
index b8433448..fe8ebcb3 100644
--- a/config/routes.js
+++ b/config/routes.js
@@ -33,11 +33,10 @@ module.exports = function(app) {
   app.get(apiPrefix + '/addr/:addr/utxo', addresses.utxo);
 
   // Address property routes
-  var addressProperties = require('../app/controllers/addressProperties.js');
-  app.get(apiPrefix + '/addr/:addr/balance', addressProperties.balance);
-  app.get(apiPrefix + '/addr/:addr/totalReceived', addressProperties.totalReceived);
-  app.get(apiPrefix + '/addr/:addr/totalSent', addressProperties.totalSent);
-  app.get(apiPrefix + '/addr/:addr/unconfirmedBalance', addressProperties.unconfirmedBalance);
+  app.get(apiPrefix + '/addr/:addr/balance', addresses.balance);
+  app.get(apiPrefix + '/addr/:addr/totalReceived', addresses.totalReceived);
+  app.get(apiPrefix + '/addr/:addr/totalSent', addresses.totalSent);
+  app.get(apiPrefix + '/addr/:addr/unconfirmedBalance', addresses.unconfirmedBalance);
 
   // Status route
   var st = require('../app/controllers/status');