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();

5
test/mocks/FakeBlockchain.js
View file

@ -46,4 +46,9 @@ FakeBlockchain.prototype.sendRawTransaction = function(rawtx, cb) {
return cb(txid);
};
FakeBlockchain.prototype.checkSentTx = function (tx, cb) {
var txid = '0be0fb4579911be829e3077202e1ab47fcc12cf3ab8f8487ccceae768e1f95fa';
return cb(null, txid);
};
module.exports = FakeBlockchain;

2
test/mocks/FakeBuilder.js
View file

@ -8,7 +8,6 @@ function Tx() {
this.ins = [{s: VALID_SCRIPTSIG_BUF }];
};
Tx.prototype.getHashType = function() {
return 1;
};
@ -20,7 +19,6 @@ Tx.prototype.hashForSignature = function() {
return new Buffer('31103626e162f1cbfab6b95b08c9f6e78aae128523261cb37f8dfd4783cb09a7', 'hex');
};
function FakeBuilder() {
this.test = 1;
this.tx = new Tx();

29
test/test.Wallet.js
View file

@ -15,6 +15,7 @@ var PrivateKey = copay.PrivateKey;
var Storage = require('./mocks/FakeStorage');
var Network = require('./mocks/FakeNetwork');
var Blockchain = require('./mocks/FakeBlockchain');
var Builder = require('./mocks/FakeBuilder');
var bitcore = bitcore || require('bitcore');
var TransactionBuilder = bitcore.TransactionBuilder;
var Transaction = bitcore.Transaction;
@ -104,6 +105,7 @@ describe('Wallet model', function() {
c.verbose = walletConfig.verbose;
c.version = '0.0.1';
return new Wallet(c);
}
@ -739,6 +741,33 @@ describe('Wallet model', function() {
});
});
});
it('should fail to send incomplete transaction', function(done) {
var w = createW2(null, 1);
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx(toAddress, amountSatStr, null, function(ntxid) {
var txp = w.txProposals.get(ntxid);
// Assign fake builder
txp.builder = new Builder();
sinon.stub(txp.builder, 'build').returns({ isComplete: function () { return false; }});
(function () {
w.sendTx(ntxid);
}).should.throw('Tx is not complete. Can not broadcast');
done();
});
});
it('should check if transaction already sent when failing to send', function(done) {
var w = createW2(null, 1);
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx(toAddress, amountSatStr, null, function(ntxid) {
sinon.stub(w.blockchain, 'sendRawTransaction').yields(undefined);
var spyCheckSentTx = sinon.spy(w, '_checkSentTx');
w.sendTx(ntxid, function () {});
chai.expect(spyCheckSentTx.calledOnce).to.be.true;
done();
});
});
it('should send TxProposal', function(done) {
var w = cachedCreateW2();
var utxo = createUTXO(w);