Conflicts solved
This commit is contained in:
parent
ecea1a654d
commit
2b540264a5
2 changed files with 18 additions and 1 deletions
|
|
@ -87,7 +87,7 @@ function Wallet(opts) {
|
||||||
this.lastMessageFrom = {};
|
this.lastMessageFrom = {};
|
||||||
|
|
||||||
//to avoid confirmation of copayer's backups if is imported from a file
|
//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 || {};
|
this.paymentRequests = opts.paymentRequests || {};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -840,6 +840,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() {
|
describe('removeTxWithSpentInputs', function() {
|
||||||
it('should remove pending TxProposal with spent inputs', function(done) {
|
it('should remove pending TxProposal with spent inputs', function(done) {
|
||||||
var w = cachedCreateW2();
|
var w = cachedCreateW2();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue