BTCPrivate
/
bitcore-wallet-service
mirror of https://github.com/BTCPrivate/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #460 from isocolsky/fix/fiat-rates 

Fix returning old rates
This commit is contained in:
Matias Alejo Garcia 2016-02-11 10:39:29 -05:00
parent 9404dee2d8 3f5f219450
commit 375633b5e0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/fiatrateservice.js
View File

@ -119,7 +119,7 @@ FiatRateService.prototype.getRate = function(opts, cb) {
async.map([].concat(ts), function(ts, cb) { async.map([].concat(ts), function(ts, cb) {
self.storage.fetchFiatRate(provider, opts.code, ts, function(err, rate) { self.storage.fetchFiatRate(provider, opts.code, ts, function(err, rate) {
if (err) return cb(err); if (err) return cb(err);
if (rate && (now - rate.ts) > Defaults.FIAT_RATE_MAX_LOOK_BACK_TIME * 60 * 1000) rate = null; if (rate && (ts - rate.ts) > Defaults.FIAT_RATE_MAX_LOOK_BACK_TIME * 60 * 1000) rate = null;
return cb(null, { return cb(null, {
ts: +ts, ts: +ts,

6
test/integration/fiatrateservice.js
View File

@ -182,16 +182,16 @@ describe('Fiat rate service', function() {
value: 123.45, value: 123.45,
}], function(err) { }], function(err) {
should.not.exist(err); should.not.exist(err);
clock.tick((120 * 60 - 1) * 1000); // Almost 2 hours clock.tick(24 * 3600 * 1000); // Some time in the future
service.getRate({ service.getRate({
ts: 2 * 3600 * 1000 - 1, // almost 2 hours
code: 'USD', code: 'USD',
}, function(err, res) { }, function(err, res) {
should.not.exist(err); should.not.exist(err);
res.rate.should.equal(123.45); res.rate.should.equal(123.45);
res.fetchedOn.should.equal(0); res.fetchedOn.should.equal(0);
clock.restore();
clock.tick(2 * 1000); // 2 seconds later...
service.getRate({ service.getRate({
ts: 2 * 3600 * 1000 + 1, // just past 2 hours
code: 'USD', code: 'USD',
}, function(err, res) { }, function(err, res) {
should.not.exist(err); should.not.exist(err);