Merge pull request #336 from isocolsky/ref/feelevels
Replace feePerKB with feePerKb to match rest of API
This commit is contained in:
commit
4baaa6dbab
|
@ -260,7 +260,22 @@ ExpressApp.prototype.start = function(opts, cb) {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// DEPRECATED
|
||||||
router.get('/v1/feelevels/', function(req, res) {
|
router.get('/v1/feelevels/', function(req, res) {
|
||||||
|
var opts = {};
|
||||||
|
if (req.query.network) opts.network = req.query.network;
|
||||||
|
var server = getServer(req, res);
|
||||||
|
server.getFeeLevels(opts, function(err, feeLevels) {
|
||||||
|
if (err) return returnError(err, res, req);
|
||||||
|
feeLevels = _.map(feeLevels, function(feeLevel) {
|
||||||
|
feeLevel.feePerKB = feeLevel.feePerKb;
|
||||||
|
delete feeLevel.feePerKb;
|
||||||
|
});
|
||||||
|
res.json(feeLevels);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
router.get('/v2/feelevels/', function(req, res) {
|
||||||
var opts = {};
|
var opts = {};
|
||||||
if (req.query.network) opts.network = req.query.network;
|
if (req.query.network) opts.network = req.query.network;
|
||||||
var server = getServer(req, res);
|
var server = getServer(req, res);
|
||||||
|
|
|
@ -917,11 +917,11 @@ WalletService.prototype._sampleFeeLevels = function(network, points, cb) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var levels = _.zipObject(_.map(points, function(p) {
|
var levels = _.zipObject(_.map(points, function(p) {
|
||||||
var feePerKB = _.isObject(result) ? +result[p] : -1;
|
var feePerKb = _.isObject(result) ? +result[p] : -1;
|
||||||
if (feePerKB < 0) {
|
if (feePerKb < 0) {
|
||||||
log.warn('Could not compute fee estimation (nbBlocks=' + p + ')');
|
log.warn('Could not compute fee estimation (nbBlocks=' + p + ')');
|
||||||
}
|
}
|
||||||
return [p, Utils.strip(feePerKB * 1e8)];
|
return [p, Utils.strip(feePerKb * 1e8)];
|
||||||
}));
|
}));
|
||||||
|
|
||||||
return cb(null, levels);
|
return cb(null, levels);
|
||||||
|
@ -951,10 +951,10 @@ WalletService.prototype.getFeeLevels = function(opts, cb) {
|
||||||
level: level.name,
|
level: level.name,
|
||||||
};
|
};
|
||||||
if (err || feeSamples[level.nbBlocks] < 0) {
|
if (err || feeSamples[level.nbBlocks] < 0) {
|
||||||
result.feePerKB = level.defaultValue;
|
result.feePerKb = level.defaultValue;
|
||||||
result.nbBlocks = null;
|
result.nbBlocks = null;
|
||||||
} else {
|
} else {
|
||||||
result.feePerKB = feeSamples[level.nbBlocks];
|
result.feePerKb = feeSamples[level.nbBlocks];
|
||||||
result.nbBlocks = level.nbBlocks;
|
result.nbBlocks = level.nbBlocks;
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
|
|
|
@ -1905,13 +1905,13 @@ describe('Wallet service', function() {
|
||||||
fees = _.zipObject(_.map(fees, function(item) {
|
fees = _.zipObject(_.map(fees, function(item) {
|
||||||
return [item.level, item];
|
return [item.level, item];
|
||||||
}));
|
}));
|
||||||
fees.priority.feePerKB.should.equal(40000);
|
fees.priority.feePerKb.should.equal(40000);
|
||||||
fees.priority.nbBlocks.should.equal(1);
|
fees.priority.nbBlocks.should.equal(1);
|
||||||
|
|
||||||
fees.normal.feePerKB.should.equal(20000);
|
fees.normal.feePerKb.should.equal(20000);
|
||||||
fees.normal.nbBlocks.should.equal(2);
|
fees.normal.nbBlocks.should.equal(2);
|
||||||
|
|
||||||
fees.economy.feePerKB.should.equal(18000);
|
fees.economy.feePerKb.should.equal(18000);
|
||||||
fees.economy.nbBlocks.should.equal(6);
|
fees.economy.nbBlocks.should.equal(6);
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
@ -1921,7 +1921,7 @@ describe('Wallet service', function() {
|
||||||
server.getFeeLevels({}, function(err, fees) {
|
server.getFeeLevels({}, function(err, fees) {
|
||||||
should.not.exist(err);
|
should.not.exist(err);
|
||||||
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);
|
fees.priority.should.equal(50000);
|
||||||
fees.normal.should.equal(20000);
|
fees.normal.should.equal(20000);
|
||||||
|
@ -1940,13 +1940,13 @@ describe('Wallet service', function() {
|
||||||
fees = _.zipObject(_.map(fees, function(item) {
|
fees = _.zipObject(_.map(fees, function(item) {
|
||||||
return [item.level, item];
|
return [item.level, item];
|
||||||
}));
|
}));
|
||||||
fees.priority.feePerKB.should.equal(50000);
|
fees.priority.feePerKb.should.equal(50000);
|
||||||
should.not.exist(fees.priority.nbBlocks);
|
should.not.exist(fees.priority.nbBlocks);
|
||||||
|
|
||||||
fees.normal.feePerKB.should.equal(18000);
|
fees.normal.feePerKb.should.equal(18000);
|
||||||
fees.normal.nbBlocks.should.equal(2);
|
fees.normal.nbBlocks.should.equal(2);
|
||||||
|
|
||||||
fees.economy.feePerKB.should.equal(0);
|
fees.economy.feePerKb.should.equal(0);
|
||||||
fees.economy.nbBlocks.should.equal(6);
|
fees.economy.nbBlocks.should.equal(6);
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue