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

Merge pull request #1199 from isocolsky/test/sendTx

Browse source 
Test wallet#sendTx
This commit is contained in:
Manuel Aráoz 2014-08-27 11:03:41 -03:00
commit a37e31ec80
4 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -798,7 +798,6 @@ Wallet.prototype.sendTx = function(ntxid, cb) {
if (txp.merchant) {
return this.sendPaymentTx(ntxid, cb);
}
var tx = txp.builder.build();
if (!tx.isComplete())
throw new Error('Tx is not complete. Can not broadcast');
@ -818,7 +817,7 @@ Wallet.prototype.sendTx = function(ntxid, cb) {
self.store();
return cb(txid);
} else {
self.log('Sent failed. Checking is the TX was sent already');
self.log('Sent failed. Checking if the TX was sent already');
self._checkSentTx(ntxid, function(txid) {
if (txid)
self.store();