anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Only remove pending txps

Browse source
This commit is contained in:
Ivan Socolsky 2014-09-04 17:37:38 -03:00
commit ace301d1f8
2 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/models/core/Wallet.js
View file

@ -1529,7 +1529,16 @@ Wallet.prototype.removeTxWithSpentInputs = function(cb) {
var self = this; var self = this;
cb = cb || function () {}; cb = cb || function () {};
var txps = this.getTxProposals();
var txps = [];
var maxRejectCount = this.maxRejectCount();
for (var ntxid in this.txProposals.txps) {
var txp = this.txProposals.txps[ntxid];
txp.ntxid = ntxid;
if (txp.isPending(maxRejectCount)) {
txps.push(txp);
}
}
var inputs = []; var inputs = [];
txps.forEach(function (txp) { txps.forEach(function (txp) {

30
test/test.Wallet.js
View file

@ -802,8 +802,8 @@ describe('Wallet model', function() {
}); });
}); });
describe('removeTxWithSpentInputs', function () { describe.only('removeTxWithSpentInputs', function () {
it('should remove TxProposal with spent inputs', function(done) { it('should remove pending TxProposal with spent inputs', function(done) {
var w = cachedCreateW2(); var w = cachedCreateW2();
var utxo = createUTXO(w); var utxo = createUTXO(w);
chai.expect(w.getTxProposals().length).to.equal(0); chai.expect(w.getTxProposals().length).to.equal(0);
@ -825,7 +825,7 @@ describe('Wallet model', function() {
}); });
}); });
it('should remove TxProposal with at least 1 spent input', function(done) { it('should remove pending TxProposal with at least 1 spent input', function(done) {
var w = cachedCreateW2(); var w = cachedCreateW2();
var utxo = [createUTXO(w)[0], createUTXO(w)[0]]; var utxo = [createUTXO(w)[0], createUTXO(w)[0]];
utxo[0].amount = 80000; utxo[0].amount = 80000;
@ -849,6 +849,30 @@ describe('Wallet model', function() {
done(); done();
}); });
}); });
it('should not remove complete TxProposal', function(done) {
var w = cachedCreateW2();
var utxo = createUTXO(w);
chai.expect(w.getTxProposals().length).to.equal(0);
w.blockchain.fixUnspent(utxo);
w.createTx(toAddress, amountSatStr, null, function(ntxid) {
w.sendTxProposal(ntxid);
chai.expect(w.getTxProposals().length).to.equal(1);
// Inputs are still available, txp still valid
w.removeTxWithSpentInputs();
chai.expect(w.getTxProposals().length).to.equal(1);
// Simulate input spent. txp should be removed from txps list
w.blockchain.fixUnspent([]);
var txp = w.txProposals.get(ntxid);
sinon.stub(txp, 'isPending', function () { return false; })
w.removeTxWithSpentInputs();
chai.expect(w.getTxProposals().length).to.equal(1);
done();
});
});
}); });
describe('#send', function() { describe('#send', function() {