RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #260 from isocolsky/paginate_txs

Browse Source 
Paginate txs
This commit is contained in:
Matias Alejo Garcia 2014-11-20 18:21:26 -03:00
commit 85e4f78b09
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/addresses.js
View File

@ -141,7 +141,7 @@ exports.multitxs = function(req, res, next) {
var as = getAddrs(req, res, next); var as = getAddrs(req, res, next);
if (as) { if (as) {
var txs = []; var txs = [];
async.each(as, function(a, callback) { async.eachLimit(as, 10, function(a, callback) {
a.update(function(err) { a.update(function(err) {
if (err) callback(err); if (err) callback(err);
txs.push(a.transactions); txs.push(a.transactions);
@ -152,7 +152,6 @@ exports.multitxs = function(req, res, next) {
processTxs(txs, from, to, function (err, transactions) { processTxs(txs, from, to, function (err, transactions) {
if (err) return common.handleErrors(err, res); if (err) return common.handleErrors(err, res);
res.jsonp(transactions); res.jsonp(transactions);
return next();
}); });
}); });
} }

21
test/integration/txs.js
View File

@ -34,21 +34,14 @@ describe('Transactions for multiple addresses', function() {
beforeEach(function(c) { beforeEach(function(c) {
req = {}; req = {};
res = {}; res = {};
res.jsonp = sinon.spy();
return c(); return c();
}); });
describe('Transactions from multiple addresses', function () { describe('Transactions from multiple addresses', function () {
_.each(fixture, function (f) { _.each(fixture, function (f) {
it(f.test, function (done) { it(f.test, function (done) {
req.param = sinon.stub(); var checkResult = function(txs) {
req.param.withArgs('addrs').returns(f.addrs.join(',')); var paginated = !_.isUndefined(f.from) || !_.isUndefined(f.to);
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];
txs.should.exist; txs.should.exist;
if (paginated) { if (paginated) {
txs.totalItems.should.equal(f.totalTransactions); txs.totalItems.should.equal(f.totalTransactions);
@ -61,7 +54,15 @@ describe('Transactions for multiple addresses', function() {
txs.length.should.equal(f.returnedTransactions); txs.length.should.equal(f.returnedTransactions);
} }
done(); 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);
}); });
}); });
}); });