From d56368afb01b1c85c73ca8cc07fb8484e352b5ec Mon Sep 17 00:00:00 2001
From: Gustavo Cortez <cmgustavo83@gmail.com>
Date: Tue, 27 May 2014 18:02:32 -0300
Subject: [PATCH] Reorder functions

---
 app/controllers/addresses.js | 20 +-------------------
 app/models/Address.js        | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/controllers/addresses.js b/app/controllers/addresses.js
index 8a1f8bd6..4d5b984a 100644
--- a/app/controllers/addresses.js
+++ b/app/controllers/addresses.js
@@ -43,24 +43,6 @@ var getAddrs = function(req, res, next) {
   return as;
 };
 
-var normalizeAddr = function(a) {
-  // Normalize json address
-  return {
-    'addrStr':                  a.addrStr,
-    'balance':                  a.balance,
-    'balanceSat':               a.balanceSat,
-    'totalReceived':            a.totalReceived,
-    'totalReceivedSat':         a.totalReceivedSat,
-    'totalSent':                a.totalSent,
-    'totalSentSat':             a.totalSentSat,
-    'unconfirmedBalance':       a.unconfirmedBalance,
-    'unconfirmedBalanceSat':    a.unconfirmedBalanceSat,
-    'unconfirmedTxApperances':  a.unconfirmedTxApperances,
-    'txApperances':             a.txApperances,
-    'transactions':             a.transactions
-  };
-};
-
 exports.show = function(req, res, next) {
   var a = getAddr(req, res, next);
 
@@ -69,7 +51,7 @@ exports.show = function(req, res, next) {
       if (err) {
         return common.handleErrors(err, res);
       } else {
-        return res.jsonp(normalizeAddr(a));
+        return res.jsonp(a.getObj());
       }
     }, req.query.noTxList);
   }
diff --git a/app/models/Address.js b/app/models/Address.js
index 7ec5ad1f..1e5e8b31 100644
--- a/app/models/Address.js
+++ b/app/models/Address.js
@@ -74,6 +74,24 @@ function Address(addrStr) {
 
 }
 
+Address.prototype.getObj = function() {
+  // Normalize json address
+  return {
+    'addrStr':                  this.addrStr,
+    'balance':                  this.balance,
+    'balanceSat':               this.balanceSat,
+    'totalReceived':            this.totalReceived,
+    'totalReceivedSat':         this.totalReceivedSat,
+    'totalSent':                this.totalSent,
+    'totalSentSat':             this.totalSentSat,
+    'unconfirmedBalance':       this.unconfirmedBalance,
+    'unconfirmedBalanceSat':    this.unconfirmedBalanceSat,
+    'unconfirmedTxApperances':  this.unconfirmedTxApperances,
+    'txApperances':             this.txApperances,
+    'transactions':             this.transactions
+  };
+};
+
 Address.prototype.getUtxo = function(next) {
   var self = this;
   var tDb   = TransactionDb;