fix txProposal#isPending
This commit is contained in:
parent
4ce51b2e39
commit
7726a69ae5
|
@ -147,7 +147,7 @@ TxProposal.prototype.reject = function(copayerId) {
|
|||
};
|
||||
|
||||
TxProposal.prototype.isPending = function() {
|
||||
return this.status === 'pending';
|
||||
return !_.any(['boradcasted', 'rejected'], this.status);
|
||||
};
|
||||
|
||||
TxProposal.prototype.isAccepted = function() {
|
||||
|
|
|
@ -978,10 +978,8 @@ describe('Copay server', function() {
|
|||
|
||||
server.getPendingTxs({}, function(err, txps) {
|
||||
should.not.exist(err);
|
||||
txps.length.should.equal(0);
|
||||
server.getTx({
|
||||
id: txpid
|
||||
}, function(err, txp) {
|
||||
txps.length.should.equal(1);
|
||||
var txp = txps[0];
|
||||
txp.status.should.equal('accepted');
|
||||
should.not.exist(txp.txid);
|
||||
done();
|
||||
|
@ -991,7 +989,6 @@ describe('Copay server', function() {
|
|||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('Multisignature wallet', function() {
|
||||
it.skip('all copayers should see pending proposal created by one copayer', function(done) {});
|
||||
|
|
Loading…
Reference in New Issue