From 4e42375ad417984f8a3d1c4ebe7f13cb9564402c Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Fri, 4 Nov 2016 11:39:27 -0300 Subject: [PATCH] redefine fee levels --- lib/common/defaults.js | 8 ++++---- test/integration/server.js | 25 ++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/lib/common/defaults.js b/lib/common/defaults.js index ba65a13..a4fb339 100644 --- a/lib/common/defaults.js +++ b/lib/common/defaults.js @@ -26,11 +26,11 @@ Defaults.SCAN_ADDRESS_GAP = Defaults.MAX_MAIN_ADDRESS_GAP + 20; Defaults.FEE_LEVELS = [{ name: 'priority', - nbBlocks: 1, + nbBlocks: 2, defaultValue: 50000 }, { name: 'normal', - nbBlocks: 2, + nbBlocks: 3, defaultValue: 40000 }, { name: 'economy', @@ -85,7 +85,7 @@ Defaults.BLOCKHEIGHT_CACHE_TIME = 10 * 60; // Max allowed timespan for notification queries in seconds -Defaults.MAX_NOTIFICATIONS_TIMESPAN = 60 * 60 * 24 * 14 ; // ~ 2 weeks -Defaults.NOTIFICATIONS_TIMESPAN = 60; +Defaults.MAX_NOTIFICATIONS_TIMESPAN = 60 * 60 * 24 * 14; // ~ 2 weeks +Defaults.NOTIFICATIONS_TIMESPAN = 60; module.exports = Defaults; diff --git a/test/integration/server.js b/test/integration/server.js index e6c3dc7..71bd247 100644 --- a/test/integration/server.js +++ b/test/integration/server.js @@ -2043,7 +2043,30 @@ describe('Wallet service', function() { }); describe('#getFeeLevels', function() { - var server, wallet; + var server, wallet, levels; + before(function() { + levels = Defaults.FEE_LEVELS; + Defaults.FEE_LEVELS = [{ + name: 'priority', + nbBlocks: 1, + defaultValue: 50000 + }, { + name: 'normal', + nbBlocks: 2, + defaultValue: 40000 + }, { + name: 'economy', + nbBlocks: 6, + defaultValue: 25000 + }, { + name: 'superEconomy', + nbBlocks: 24, + defaultValue: 10000 + }]; + }); + after(function() { + Defaults.FEE_LEVELS = levels; + }); beforeEach(function(done) { helpers.createAndJoinWallet(1, 1, function(s, w) { server = s;