BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Conflicts solved

This commit is contained in:
Matias Pando 2014-09-11 10:28:56 -03:00
parent 63cffcc921
commit e819073003
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/models/core/Wallet.js
View File

@ -87,7 +87,7 @@ function Wallet(opts) {
this.lastMessageFrom = {};
//to avoid confirmation of copayer's backups if is imported from a file
this.isImported = opts.isImported;
this.isImported = opts.isImported || false;
this.paymentRequests = opts.paymentRequests || {};

19
test/test.Wallet.js
View File

@ -829,6 +829,23 @@ describe('Wallet model', function() {
});
});
describe('#createTxSync', function() {
it('should fail if amount below min value', function() {
var w = cachedCreateW2();
var utxo = createUTXO(w);
var badCreate = function() {
w.createTxSync(
'mgGJEugdPnvhmRuFdbdQcFfoFLc1XXeB79',
'123',
null,
utxo
);
}
chai.expect(badCreate).to.throw('invalid amount');
});
});
describe('removeTxWithSpentInputs', function() {
it('should remove pending TxProposal with spent inputs', function(done) {
var w = cachedCreateW2();
@ -1533,4 +1550,4 @@ describe('Wallet model', function() {
should.exist(n.networkNonce);
});
});
});