From 24eafb00d11ed124453b8386f2d953fb726505b3 Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Thu, 20 Nov 2014 16:43:59 -0300
Subject: [PATCH 1/2] removed call to next(). fixed tests

---
 app/controllers/addresses.js |  1 -
 test/integration/txs.js      | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/addresses.js b/app/controllers/addresses.js
index 28d6631..7a6ca75 100644
--- a/app/controllers/addresses.js
+++ b/app/controllers/addresses.js
@@ -152,7 +152,6 @@ exports.multitxs = function(req, res, next) {
       processTxs(txs, from, to, function (err, transactions) {
         if (err) return common.handleErrors(err, res);
         res.jsonp(transactions);
-        return next();
       });
     });
   }
diff --git a/test/integration/txs.js b/test/integration/txs.js
index 7e92ab7..0fc18f9 100644
--- a/test/integration/txs.js
+++ b/test/integration/txs.js
@@ -34,21 +34,14 @@ describe('Transactions for multiple addresses', function() {
   beforeEach(function(c) {
     req = {};
     res = {};
-    res.jsonp = sinon.spy();
     return c();
   });
 
   describe('Transactions from multiple addresses', function () {
     _.each(fixture, function (f) {
       it(f.test, function (done) {
-        req.param = sinon.stub();
-        req.param.withArgs('addrs').returns(f.addrs.join(','));
-        req.param.withArgs('from').returns(f.from);
-        req.param.withArgs('to').returns(f.to);
-
-        var paginated = !_.isUndefined(f.from) || !_.isUndefined(f.to);
-        addresses.multitxs(req, res, function() {
-          var txs = res.jsonp.getCall(0).args[0];
+        var checkResult = function(txs) {
+          var paginated = !_.isUndefined(f.from) || !_.isUndefined(f.to);
           txs.should.exist;
           if (paginated) {
             txs.totalItems.should.equal(f.totalTransactions);
@@ -61,7 +54,15 @@ describe('Transactions for multiple addresses', function() {
             txs.length.should.equal(f.returnedTransactions);
           }
           done();
-        });
+        };
+
+        res.jsonp = checkResult;
+        req.param = sinon.stub();
+        req.param.withArgs('addrs').returns(f.addrs.join(','));
+        req.param.withArgs('from').returns(f.from);
+        req.param.withArgs('to').returns(f.to);
+
+        addresses.multitxs(req, res);
       });
     });
   });

From a7144fa02eff76658d1bce1497fa72136c7d2924 Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Thu, 20 Nov 2014 17:35:44 -0300
Subject: [PATCH 2/2] added limit to async.each

---
 app/controllers/addresses.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/addresses.js b/app/controllers/addresses.js
index 7a6ca75..30cfca3 100644
--- a/app/controllers/addresses.js
+++ b/app/controllers/addresses.js
@@ -141,7 +141,7 @@ exports.multitxs = function(req, res, next) {
   var as = getAddrs(req, res, next);
   if (as) {
     var txs = [];
-    async.each(as, function(a, callback) {
+    async.eachLimit(as, 10, function(a, callback) {
       a.update(function(err) {
         if (err) callback(err);
         txs.push(a.transactions);