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

getLatestNotifications -> getNotifications

activeAddress
Ivan Socolsky 9 years ago
parent
3bb097c7f4
commit
bf40b5a000
3 changed files with 27 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      lib/server.js
  2. 2
      lib/storage.js
  3. 67
      test/integration/server.js

7
lib/server.js
View File

@ -1645,15 +1645,14 @@ WalletService.prototype.getTxs = function(opts, cb) {
* *
* @param {Object} opts * @param {Object} opts
* @param {Object} opts.notificationId (optional) * @param {Object} opts.notificationId (optional)
* @param {Object} opts.minTs (optional) - default now - 60 sec. * @param {Object} opts.minTs (optional) - default 0.
* @returns {Notification[]} Notifications * @returns {Notification[]} Notifications
*/ */
WalletService.prototype.getLatestNotifications = function(opts, cb) { WalletService.prototype.getNotifications = function(opts, cb) {
var self = this; var self = this;
opts = opts || {}; opts = opts || {};
var minTs = _.isNumber(opts.minTs) ? opts.minTs : +Date.now() - (60 * 1000); self.storage.fetchNotifications(self.walletId, opts.notificationId, opts.minTs || 0, function(err, notifications) {
self.storage.fetchLatestNotifications(self.walletId, opts.notificationId, minTs, function(err, notifications) {
if (err) return cb(err); if (err) return cb(err);
return cb(null, notifications); return cb(null, notifications);
}); });

2
lib/storage.js
View File

@ -322,7 +322,7 @@ Storage.prototype.fetchNotifications = function(walletId, opts, cb) {
* @param {Number} minTs * @param {Number} minTs
* @returns {Notification[]} Notifications * @returns {Notification[]} Notifications
*/ */
Storage.prototype.fetchLatestNotifications = function(walletId, notificationId, minTs, cb) { Storage.prototype.fetchNotifications = function(walletId, notificationId, minTs, cb) {
function makeId(timestamp) { function makeId(timestamp) {
return _.padLeft(timestamp, 14, '0') + _.repeat('0', 4); return _.padLeft(timestamp, 14, '0') + _.repeat('0', 4);
}; };

67
test/integration/server.js
View File

@ -1041,9 +1041,7 @@ describe('Wallet service', function() {
copayer.name.should.equal('me'); copayer.name.should.equal('me');
copayer.id.should.equal(copayerId); copayer.id.should.equal(copayerId);
copayer.customData.should.equal('dummy custom data'); copayer.customData.should.equal('dummy custom data');
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var notif = _.find(notifications, { var notif = _.find(notifications, {
type: 'NewCopayer' type: 'NewCopayer'
@ -1252,9 +1250,7 @@ describe('Wallet service', function() {
should.not.exist(err); should.not.exist(err);
wallet.status.should.equal('complete'); wallet.status.should.equal('complete');
wallet.publicKeyRing.length.should.equal(3); wallet.publicKeyRing.length.should.equal(3);
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var notif = _.find(notifications, { var notif = _.find(notifications, {
type: 'WalletComplete' type: 'WalletComplete'
@ -1269,9 +1265,7 @@ describe('Wallet service', function() {
it('should not notify WalletComplete if 1-of-1', function(done) { it('should not notify WalletComplete if 1-of-1', function(done) {
helpers.createAndJoinWallet(1, 1, function(server) { helpers.createAndJoinWallet(1, 1, function(server) {
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var notif = _.find(notifications, { var notif = _.find(notifications, {
type: 'WalletComplete' type: 'WalletComplete'
@ -1560,9 +1554,7 @@ describe('Wallet service', function() {
address.isChange.should.be.false; address.isChange.should.be.false;
address.path.should.equal('m/2147483647/0/0'); address.path.should.equal('m/2147483647/0/0');
address.type.should.equal('P2SH'); address.type.should.equal('P2SH');
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var notif = _.find(notifications, { var notif = _.find(notifications, {
type: 'NewAddress' type: 'NewAddress'
@ -1625,9 +1617,7 @@ describe('Wallet service', function() {
address.isChange.should.be.false; address.isChange.should.be.false;
address.path.should.equal('m/0/0'); address.path.should.equal('m/0/0');
address.type.should.equal('P2SH'); address.type.should.equal('P2SH');
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var notif = _.find(notifications, { var notif = _.find(notifications, {
type: 'NewAddress' type: 'NewAddress'
@ -1694,9 +1684,7 @@ describe('Wallet service', function() {
address.isChange.should.be.false; address.isChange.should.be.false;
address.path.should.equal('m/0/0'); address.path.should.equal('m/0/0');
address.type.should.equal('P2PKH'); address.type.should.equal('P2PKH');
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var notif = _.find(notifications, { var notif = _.find(notifications, {
type: 'NewAddress' type: 'NewAddress'
@ -3617,9 +3605,7 @@ describe('Wallet service', function() {
txp.actions.length.should.equal(1); txp.actions.length.should.equal(1);
var action = txp.getActionBy(wallet.copayers[0].id); var action = txp.getActionBy(wallet.copayers[0].id);
action.type.should.equal('accept'); action.type.should.equal('accept');
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var last = _.last(notifications); var last = _.last(notifications);
last.type.should.not.equal('TxProposalFinallyAccepted'); last.type.should.not.equal('TxProposalFinallyAccepted');
@ -3649,9 +3635,7 @@ describe('Wallet service', function() {
txp.isBroadcasted().should.be.false; txp.isBroadcasted().should.be.false;
should.exist(txp.txid); should.exist(txp.txid);
txp.actions.length.should.equal(2); txp.actions.length.should.equal(2);
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var last = _.last(notifications); var last = _.last(notifications);
last.type.should.equal('TxProposalFinallyAccepted'); last.type.should.equal('TxProposalFinallyAccepted');
@ -3920,9 +3904,7 @@ describe('Wallet service', function() {
}); });
it('should pull all notifications', function(done) { it('should pull all notifications', function(done) {
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var types = _.pluck(notifications, 'type'); var types = _.pluck(notifications, 'type');
types.should.deep.equal(['NewCopayer', 'NewAddress', 'NewAddress', 'NewTxProposal', 'NewTxProposal', 'NewTxProposal']); types.should.deep.equal(['NewCopayer', 'NewAddress', 'NewAddress', 'NewTxProposal', 'NewTxProposal', 'NewTxProposal']);
@ -3937,7 +3919,9 @@ describe('Wallet service', function() {
}); });
it('should pull notifications in the last 60 seconds', function(done) { it('should pull notifications in the last 60 seconds', function(done) {
server.getLatestNotifications({}, function(err, notifications) { server.getNotifications({
minTs: +Date.now() - (60 * 1000),
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var types = _.pluck(notifications, 'type'); var types = _.pluck(notifications, 'type');
types.should.deep.equal(['NewTxProposal', 'NewTxProposal']); types.should.deep.equal(['NewTxProposal', 'NewTxProposal']);
@ -3946,13 +3930,12 @@ describe('Wallet service', function() {
}); });
it('should pull notifications after a given notification id', function(done) { it('should pull notifications after a given notification id', function(done) {
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var from = _.first(_.takeRight(notifications, 2)).id; // second to last var from = _.first(_.takeRight(notifications, 2)).id; // second to last
server.getLatestNotifications({ server.getNotifications({
notificationId: from notificationId: from,
minTs: +Date.now() - (60 * 1000),
}, function(err, res) { }, function(err, res) {
should.not.exist(err); should.not.exist(err);
res.length.should.equal(1); res.length.should.equal(1);
@ -3963,9 +3946,7 @@ describe('Wallet service', function() {
}); });
it('should contain walletId & creatorId on NewCopayer', function(done) { it('should contain walletId & creatorId on NewCopayer', function(done) {
server.getLatestNotifications({ server.getNotifications({}, function(err, notifications) {
minTs: 0,
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
var newCopayer = notifications[0]; var newCopayer = notifications[0];
newCopayer.type.should.equal('NewCopayer'); newCopayer.type.should.equal('NewCopayer');
@ -3984,7 +3965,7 @@ describe('Wallet service', function() {
txProposalId: tx.id, txProposalId: tx.id,
signatures: signatures, signatures: signatures,
}, function(err) { }, function(err) {
server.getLatestNotifications({ server.getNotifications({
minTs: Date.now(), minTs: Date.now(),
}, function(err, notifications) { }, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
@ -4004,7 +3985,7 @@ describe('Wallet service', function() {
txProposalId: tx.id, txProposalId: tx.id,
}, function(err) { }, function(err) {
should.not.exist(err); should.not.exist(err);
server.getLatestNotifications({ server.getNotifications({
minTs: Date.now(), minTs: Date.now(),
}, function(err, notifications) { }, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
@ -4032,7 +4013,7 @@ describe('Wallet service', function() {
txProposalId: tx.id txProposalId: tx.id
}, function(err, txp) { }, function(err, txp) {
should.not.exist(err); should.not.exist(err);
server.getLatestNotifications({ server.getNotifications({
minTs: Date.now(), minTs: Date.now(),
}, function(err, notifications) { }, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
@ -4064,7 +4045,7 @@ describe('Wallet service', function() {
txProposalId: tx.id txProposalId: tx.id
}, function(err, txp) { }, function(err, txp) {
should.not.exist(err); should.not.exist(err);
server.getLatestNotifications({ server.getNotifications({
minTs: Date.now(), minTs: Date.now(),
}, function(err, notifications) { }, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
@ -4123,7 +4104,7 @@ describe('Wallet service', function() {
}); });
}, },
function(next) { function(next) {
server.storage.fetchNotifications(wallet.id, {}, function(err, items) { server.getNotifications({}, function(err, items) {
items.length.should.equal(0); items.length.should.equal(0);
next(); next();
}); });
@ -4196,9 +4177,7 @@ describe('Wallet service', function() {
}); });
}, },
function(next) { function(next) {
server2.getLatestNotifications({ server2.getNotifications({}, function(err, notifications) {
minTs: 0
}, function(err, notifications) {
should.not.exist(err); should.not.exist(err);
should.exist(notifications); should.exist(notifications);
notifications.length.should.above(0); notifications.length.should.above(0);

Write Preview
Loading…
Cancel
Save