From fc94c2e0cf640d9f3f2e75cdc1be9b37832d962e Mon Sep 17 00:00:00 2001
From: Ivan Socolsky <jungans@gmail.com>
Date: Thu, 23 Jul 2015 11:02:34 -0300
Subject: [PATCH] return nbBlocks = null when fee level is unavailable

---
 lib/server.js              | 34 ++++++++++------------------------
 package.json               |  4 ++--
 test/integration/server.js | 13 +++++++++----
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index 8ed97d2..49dd387 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -792,35 +792,21 @@ WalletService.prototype.getFeeLevels = function(opts, cb) {
   if (network != 'livenet' && network != 'testnet')
     return cb(new ClientError('Invalid network'));
 
-  var levels = [{
-    name: 'priority',
-    nbBlocks: 1,
-    defaultValue: 50000
-  }, {
-    name: 'normal',
-    nbBlocks: 4,
-    defaultValue: 20000
-  }, {
-    name: 'economy',
-    nbBlocks: 12,
-    defaultValue: 10000
-  }, ];
-
+  var levels = WalletUtils.FEE_LEVELS;
   var samplePoints = _.uniq(_.pluck(levels, 'nbBlocks'));
   self._sampleFeeLevels(network, samplePoints, function(err, feeSamples) {
     var values = _.map(levels, function(level) {
-      var feePerKB;
-      if (err) {
-        feePerKB = level.defaultValue;
-      } else {
-        var sample = feeSamples[level.nbBlocks];
-        feePerKB = (sample < 0) ? level.defaultValue : sample;
-      }
-      return {
+      var result = { 
         level: level.name,
-        feePerKB: feePerKB,
-        nbBlocks: level.nbBlocks,
       };
+      if (err || feeSamples[level.nbBlocks] < 0) {
+        result.feePerKB = level.defaultValue;
+        result.nbBlocks = null;
+      } else {
+        result.feePerKB = feeSamples[level.nbBlocks];
+        result.nbBlocks = level.nbBlocks;
+      }
+      return result;
     });
 
     return cb(null, values);
diff --git a/package.json b/package.json
index 12c0032..4e837c3 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "bitcore-wallet-service",
   "description": "A service for Mutisig HD Bitcoin Wallets",
   "author": "BitPay Inc",
-  "version": "0.0.45",
+  "version": "0.0.46",
   "keywords": [
     "bitcoin",
     "copay",
@@ -20,7 +20,7 @@
   "dependencies": {
     "async": "^0.9.0",
     "bitcore": "^0.12.9",
-    "bitcore-wallet-utils": "^0.0.21",
+    "bitcore-wallet-utils": "^0.0.22",
     "body-parser": "^1.11.0",
     "coveralls": "^2.11.2",
     "email-validator": "^1.0.1",
diff --git a/test/integration/server.js b/test/integration/server.js
index 45e851b..9109053 100644
--- a/test/integration/server.js
+++ b/test/integration/server.js
@@ -1512,11 +1512,16 @@ describe('Wallet service', function() {
       server.getFeeLevels({}, function(err, fees) {
         should.not.exist(err);
         fees = _.zipObject(_.map(fees, function(item) {
-          return [item.level, item.feePerKB];
+          return [item.level, item];
         }));
-        fees.priority.should.equal(50000);
-        fees.normal.should.equal(18000);
-        fees.economy.should.equal(0);
+        fees.priority.feePerKB.should.equal(50000);
+        should.not.exist(fees.priority.nbBlocks);
+        
+        fees.normal.feePerKB.should.equal(18000);
+        fees.normal.nbBlocks.should.equal(4);
+        
+        fees.economy.feePerKB.should.equal(0);
+        fees.economy.nbBlocks.should.equal(12);
         done();
       });
     });