tests again!

This commit is contained in:
Matias Alejo Garcia 2014-11-23 17:41:34 -03:00
commit 9b327cd458
5 changed files with 79 additions and 74 deletions

View file

@ -371,7 +371,7 @@ describe('TxProposal', function() {
it('with less signatures', function() {
var backup = txp.builder.vanilla.scriptSig[0];
txp.builder.merge = function() {
// 2 signatures.
// Only one signatures.
this.vanilla.scriptSig = ['0048304502207d8e832bd576c93300e53ab6cbd68641961bec60690c358fd42d8e42b7d7d687022100a1daa89923efdb4c9b615d065058d9e1644f67000694a7d0806759afa7bef19b014cad532103197599f6e209cefef07da2fddc6fe47715a70162c531ffff8e611cef23dfb70d210380a29968851f93af55e581c43d9ef9294577a439a3ca9fc2bc47d1ca2b3e9127210392dccb2ed470a45984811d6402fdca613c175f8f3e4eb8e2306e8ccd7d0aed032103a94351fecc4328bb683bf93a1aa67378374904eac5980c7966723a51897c56e32103e085eb6fa1f20b2722c16161144314070a2c316a9cae2489fd52ce5f63fff6e455ae'];
this.tx.ins[0].s = new Buffer(this.vanilla.scriptSig[0], 'hex');
};

View file

@ -234,7 +234,7 @@ describe('Wallet model', function() {
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true);
var f = function() {
var ntxid = w.createTxProposal(
var ntxid = w._createTxProposal(
'15q6HKjWHAksHcH91JW23BJEuzZgFwydBt',
'123456789',
null,
@ -250,7 +250,7 @@ describe('Wallet model', function() {
var w = cachedCreateW2();
unspentTest[0].address = w.publicKeyRing.getAddress(1, true, w.publicKey).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true, w.publicKey);
var txp = w.createTxProposal(
var txp = w._createTxProposal(
'mgGJEugdPnvhmRuFdbdQcFfoFLc1XXeB79',
'123456789',
null,
@ -269,7 +269,7 @@ describe('Wallet model', function() {
unspentTest[0].address = w.publicKeyRing.getAddress(1, true, w.publicKey).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true, w.publicKey);
var txp = w.createTxProposal(
var txp = w._createTxProposal(
'mgGJEugdPnvhmRuFdbdQcFfoFLc1XXeB79',
'123456789',
null,
@ -282,6 +282,7 @@ describe('Wallet model', function() {
chai.expect(txp.comment).to.be.null;
tx.isComplete().should.equal(false);
Object.keys(txp.seenBy).length.should.equal(1);
Object.keys(txp.signedBy).length.should.equal(1);
});
it('#create with comment', function() {
@ -292,7 +293,7 @@ describe('Wallet model', function() {
unspentTest[0].address = w.publicKeyRing.getAddress(1, true, w.publicKey).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true, w.publicKey);
var txp = w.createTxProposal(
var txp = w._createTxProposal(
'mgGJEugdPnvhmRuFdbdQcFfoFLc1XXeB79',
'123456789',
comment,
@ -313,7 +314,7 @@ describe('Wallet model', function() {
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(1, true, w.publicKey);
(function() {
w.createTxProposal(
w._createTxProposal(
'mgGJEugdPnvhmRuFdbdQcFfoFLc1XXeB79',
'123456789',
comment,
@ -342,7 +343,7 @@ describe('Wallet model', function() {
for (var index = 0; index < 3; index++) {
unspentTest[0].address = w.publicKeyRing.getAddress(index, isChange, w.publicKey).toString();
unspentTest[0].scriptPubKey = w.publicKeyRing.getScriptPubKeyHex(index, isChange, w.publicKey);
var txp = w.createTxProposal(
var txp = w._createTxProposal(
'mgGJEugdPnvhmRuFdbdQcFfoFLc1XXeB79',
'123456789',
null,
@ -778,7 +779,7 @@ describe('Wallet model', function() {
var w = cachedCreateW2();
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
@ -795,7 +796,7 @@ describe('Wallet model', function() {
var w = createW2([k2]);
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
@ -812,7 +813,7 @@ describe('Wallet model', function() {
var w = cachedCreateW2();
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
@ -827,7 +828,7 @@ describe('Wallet model', function() {
var oldK = w.privateKey;
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
@ -844,12 +845,14 @@ describe('Wallet model', function() {
var w = createW2(null, 1);
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
w.sendTx(ntxid, function(txid) {
w.broadcastTx(ntxid, function(err, txid, status) {
should.not.exist(err);
txid.length.should.equal(64);
status.should.equal(Wallet.TX_BROADCASTED);
done();
});
});
@ -858,7 +861,7 @@ describe('Wallet model', function() {
var w = createW2(null, 1);
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
@ -871,7 +874,7 @@ describe('Wallet model', function() {
}
});
(function() {
w.sendTx(ntxid);
w.broadcastTx(ntxid);
}).should.throw('Tx is not complete. Can not broadcast');
done();
});
@ -880,7 +883,7 @@ describe('Wallet model', function() {
var w = createW2(null, 1);
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
@ -888,7 +891,7 @@ describe('Wallet model', function() {
statusCode: 303
});
var spyCheckSentTx = sinon.spy(w, '_checkSentTx');
w.sendTx(ntxid, function() {});
w.broadcastTx(ntxid, function() {});
chai.expect(spyCheckSentTx.calledOnce).to.be.true;
done();
});
@ -897,7 +900,7 @@ describe('Wallet model', function() {
var w = cachedCreateW2();
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
@ -913,7 +916,7 @@ describe('Wallet model', function() {
var w = cachedCreateW2();
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
@ -994,12 +997,12 @@ describe('Wallet model', function() {
});
});
describe('#createTx', function() {
describe('#spend', function() {
it('should fail if insight server is down', function(done) {
var w = cachedCreateW2();
var utxo = createUTXO(w);
sinon.stub(w, 'getUnspent').yields('error', null);
w.createTx({
w.spend({
toAddress: toAddress,
amountSat: amountSatStr,
}, function(err, ntxid) {
@ -1014,7 +1017,7 @@ describe('Wallet model', function() {
var utxo = createUTXO(w);
w.blockchain.fixUnspent(utxo);
sinon.stub(w, 'fetchPaymentRequest').yields('error');
w.createTx({
w.spend({
url: 'test',
}, function(err, ntxid) {
should.exist(err);
@ -1038,7 +1041,7 @@ describe('Wallet model', function() {
},
total: '123400',
});
w.createTx({
w.spend({
url: 'test',
}, function(err, ntxid) {
should.not.exist(err);
@ -1150,12 +1153,12 @@ describe('Wallet model', function() {
describe('#send', function() {
describe('#_sendToPeers', function() {
it('should call this.network.send', function() {
var w = cachedCreateW2();
var save = w.network.send;
w.network.send = sinon.spy();
w.send();
w._sendToPeers(null, {type:'hola'});
w.network.send.calledOnce.should.equal(true);
w.network.send = save;
});
@ -1607,7 +1610,7 @@ describe('Wallet model', function() {
spy.called.should.be.true;
});
it('should handle new', function(done) {
it('should handle new 1', function(done) {
var data = {
txProposal: {
dummy: 1,
@ -1643,11 +1646,13 @@ describe('Wallet model', function() {
});
w._onTxProposal('senderID', data);
spy1.called.should.be.true;
spy2.called.should.be.true;
txp.setSeen.calledOnce.should.be.true;
w.sendSeen.calledOnce.should.be.true;
w.sendTxProposal.calledOnce.should.be.true;
w.sendSeen.calledOnce.should.equal(true);
w.sendTxProposal.calledOnce.should.equal(true);
});
it('should handle signed', function(done) {
@ -1715,14 +1720,14 @@ describe('Wallet model', function() {
ntxid: 1,
txp: txp,
new: false,
hasChanged: true,
hasChanged: false,
});
w._checkSentTx = sinon.stub().yields('123');
w._onTxProposal('senderID', data);
txp.setSent.calledOnce.should.be.true;
txp.setSent.calledWith('123').should.be.true;
w.sendTxProposal.called.should.be.false;
txp.setSent.calledOnce.should.equal(true);
txp.setSent.calledWith('123').should.equal(true);
w.sendTxProposal.called.should.equal(false);
done();
});
@ -1749,14 +1754,14 @@ describe('Wallet model', function() {
ntxid: 1,
txp: txp,
new: false,
hasChanged: true,
hasChanged: false,
});
w._checkSentTx = sinon.stub().yields(false);
w._onTxProposal('senderID', data);
txp.setSent.called.should.be.false;
txp.setSent.calledWith(1).should.be.false;
w.sendTxProposal.called.should.be.false;
txp.setSent.called.should.equal(false);
txp.setSent.calledWith(1).should.equal(false);
w.sendTxProposal.called.should.equal(false);
done();
});

View file

@ -10,6 +10,11 @@ function Tx() {
}];
};
Tx.prototype.getSize = function() {
return 1;
};
Tx.prototype.getHashType = function() {
return 1;
};
@ -38,7 +43,7 @@ function FakeBuilder() {
address: '2NDJbzwzsmRgD2o5HHXPhuq5g6tkKTjYkd6',
amountSatStr: '123',
}]),
}
}