Merge pull request #474 from isocolsky/default-fee-levels

New fee level defaults
This commit is contained in:
Matias Alejo Garcia 2016-03-04 10:18:50 -03:00
commit 443be97580
2 changed files with 8 additions and 5 deletions

View File

@ -32,11 +32,11 @@ Defaults.FEE_LEVELS = [{
}, { }, {
name: 'normal', name: 'normal',
nbBlocks: 2, nbBlocks: 2,
defaultValue: 20000 defaultValue: 40000
}, { }, {
name: 'economy', name: 'economy',
nbBlocks: 6, nbBlocks: 6,
defaultValue: 10000 defaultValue: 25000
}]; }];
// Minimum nb of addresses a wallet must have to start using 2-step balance optimization // Minimum nb of addresses a wallet must have to start using 2-step balance optimization

View File

@ -1856,9 +1856,12 @@ describe('Wallet service', function() {
fees = _.zipObject(_.map(fees, function(item) { fees = _.zipObject(_.map(fees, function(item) {
return [item.level, item.feePerKb]; return [item.level, item.feePerKb];
})); }));
fees.priority.should.equal(50000); var defaults = _.zipObject(_.map(Defaults.FEE_LEVELS, function(item) {
fees.normal.should.equal(20000); return [item.name, item.defaultValue];
fees.economy.should.equal(10000); }));
fees.priority.should.equal(defaults.priority);
fees.normal.should.equal(defaults.normal);
fees.economy.should.equal(defaults.economy);
done(); done();
}); });
}); });