From 9e0891f644c7fa05b475697699254ad10e5f309a Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Fri, 4 Mar 2016 09:51:34 -0300 Subject: [PATCH 1/2] new defaults --- lib/common/defaults.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/common/defaults.js b/lib/common/defaults.js index 4e21868..d21c079 100644 --- a/lib/common/defaults.js +++ b/lib/common/defaults.js @@ -32,11 +32,11 @@ Defaults.FEE_LEVELS = [{ }, { name: 'normal', nbBlocks: 2, - defaultValue: 20000 + defaultValue: 40000 }, { name: 'economy', nbBlocks: 6, - defaultValue: 10000 + defaultValue: 25000 }]; // Minimum nb of addresses a wallet must have to start using 2-step balance optimization From 900386a78ee23fa92d9cba3f2b6735667af4ab6a Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Fri, 4 Mar 2016 09:59:28 -0300 Subject: [PATCH 2/2] fix test --- test/integration/server.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/integration/server.js b/test/integration/server.js index 1aa8028..7aa5166 100644 --- a/test/integration/server.js +++ b/test/integration/server.js @@ -1856,9 +1856,12 @@ describe('Wallet service', function() { fees = _.zipObject(_.map(fees, function(item) { return [item.level, item.feePerKb]; })); - fees.priority.should.equal(50000); - fees.normal.should.equal(20000); - fees.economy.should.equal(10000); + var defaults = _.zipObject(_.map(Defaults.FEE_LEVELS, function(item) { + return [item.name, item.defaultValue]; + })); + fees.priority.should.equal(defaults.priority); + fees.normal.should.equal(defaults.normal); + fees.economy.should.equal(defaults.economy); done(); }); });