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

improve error messages

This commit is contained in:
Ivan Socolsky 2015-02-11 12:05:21 -03:00
parent 628dc12d00
commit 15798be382
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/server.js
View File

@ -496,25 +496,22 @@ CopayServer.prototype.removePendingTx = function(opts, cb) {
Utils.runLocked(self.walletId, cb, function(cb) {
self.storage.fetchTx(self.walletId, opts.id, function(err, txp) {
self.getTx({
id: opts.id
}, function(err, txp) {
if (err) return cb(err);
if (!txp)
return cb(new ClientError('Transaction proposal not found'));
if (!txp.isPending())
return cb(new ClientError('Transaction proposal not pending'));
if (txp.creatorId !== self.copayerId)
return cb(new ClientError('Not allowed to erase this TX'));
return cb(new ClientError('Only creators can remove pending proposals'));
var actors = txp.getActors();
if (actors.length > 1)
return cb(new ClientError('Not allowed to erase this TX'));
if (actors.length == 1 && actors[0] !== self.copayerId)
return cb(new ClientError('Not allowed to erase this TX'));
if (actors.length > 1 || (actors.length == 1 && actors[0] !== self.copayerId))
return cb(new ClientError('Cannot remove a proposal signed/rejected by other copayers'));
self.storage.removeTx(self.walletId, opts.id, cb);
});

4
test/integration.js
View File

@ -1310,7 +1310,7 @@ describe('Copay server', function() {
server2.removePendingTx({
id: txp.id
}, function(err) {
err.message.should.contain('Not allowed');
err.message.should.contain('creators');
server2.getPendingTxs({}, function(err, txs) {
txs.length.should.equal(1);
done();
@ -1330,7 +1330,7 @@ describe('Copay server', function() {
server.removePendingTx({
id: txp.id
}, function(err) {
err.message.should.contain('Not allowed');
err.message.should.contain('other copayers');
done();
});
});