From 6c6f726a060917b0e9ddb18380ea3418e5478169 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Thu, 16 Jul 2015 16:17:58 -0300 Subject: [PATCH] return array instead of object --- lib/server.js | 9 ++++++--- test/integration/server.js | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lib/server.js b/lib/server.js index 1f78f14..abf3120 100644 --- a/lib/server.js +++ b/lib/server.js @@ -824,7 +824,7 @@ WalletService.prototype.getFeeLevels = function(opts, cb) { var samplePoints = _.uniq(_.pluck(levels, 'nbBlocks')); self._sampleFeeLevels(network, samplePoints, function(err, feeSamples) { - var values = _.zipObject(_.map(levels, function(level) { + var values = _.map(levels, function(level) { var feePerKB; if (err) { feePerKB = level.defaultValue; @@ -832,8 +832,11 @@ WalletService.prototype.getFeeLevels = function(opts, cb) { var sample = feeSamples[level.nbBlocks]; feePerKB = (sample <= 0) ? level.defaultValue : sample * level.modifier; } - return [level.name, feePerKB] - })); + return { + level: level.name, + feePerKB: feePerKB, + }; + }); return cb(null, values); }); diff --git a/test/integration/server.js b/test/integration/server.js index b896511..0a1bfbd 100644 --- a/test/integration/server.js +++ b/test/integration/server.js @@ -1469,6 +1469,9 @@ describe('Wallet service', function() { }); server.getFeeLevels({}, function(err, fees) { should.not.exist(err); + fees = _.zipObject(_.map(fees, function(item) { + return [item.level, item.feePerKB]; + })); fees.emergency.should.equal(60000); fees.priority.should.equal(40000); fees.normal.should.equal(20000); @@ -1480,6 +1483,9 @@ describe('Wallet service', function() { blockchainExplorer.estimateFee = sinon.stub().yields('dummy error'); server.getFeeLevels({}, function(err, fees) { should.not.exist(err); + fees = _.zipObject(_.map(fees, function(item) { + return [item.level, item.feePerKB]; + })); fees.emergency.should.equal(50000); fees.priority.should.equal(20000); fees.normal.should.equal(10000); @@ -1495,6 +1501,9 @@ describe('Wallet service', function() { }); server.getFeeLevels({}, function(err, fees) { should.not.exist(err); + fees = _.zipObject(_.map(fees, function(item) { + return [item.level, item.feePerKB]; + })); fees.emergency.should.equal(50000); fees.priority.should.equal(20000); fees.normal.should.equal(18000);