fix tests

This commit is contained in:
Manuel Araoz 2015-04-24 15:18:02 -03:00
parent 029e2ef999
commit 845d4daeb7
2 changed files with 55 additions and 61 deletions

View File

@ -25,6 +25,7 @@ describe('NetworkMonitor', function() {
mockBlock.id = 'asd'; mockBlock.id = 'asd';
busMock = new EventBus(); busMock = new EventBus();
peerMock = new EventEmitter(); peerMock = new EventEmitter();
peerMock.network = Networks.testnet;
peerMock.sendMessage = sinon.spy(); peerMock.sendMessage = sinon.spy();
peerMock.connect = function() { peerMock.connect = function() {
this.emit('ready'); this.emit('ready');

View File

@ -71,27 +71,26 @@ describe('TransactionService', function() {
it('confirms correctly the first transaction on genesis block', function(callback) { it('confirms correctly the first transaction on genesis block', function(callback) {
var ops = []; var ops = [];
service._confirmTransaction(ops, genesisBlock, genesisTx).then(function() { service._confirmTransaction(ops, genesisBlock, genesisTx).then(function() {
ops.map(function(k) { var opsObj = ops.map(function(k) {
if (bitcore.util.js.isValidJSON(k.value)) { if (bitcore.util.js.isValidJSON(k.value)) {
k.value = JSON.parse(k.value); k.value = JSON.parse(k.value);
} }
return k; return k;
}).should.deep.equal([ });
{ type: 'put', opsObj.should.deep.equal([{
key: 'btx-4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b', type: 'put',
value: '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f' }, key: 'btx-4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b',
{ type: 'put', value: '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f'
key: 'txo-4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b-0', }, {
value: type: 'put',
{ satoshis: 5000000000, key: 'txo-4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b-0',
script: '65 0x04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f OP_CHECKSIG' } }, value: {
{ type: 'put', satoshis: 5000000000,
key: 'txa-1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa-4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b-0', script: '65 0x04678afdb0fe5548271967f1a67130b7105cd6a828e03909' +
value: 'a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7b' +
{ satoshis: 5000000000, 'a0b8d578a4c702b6bf11d5f OP_CHECKSIG'
script: '65 0x04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f OP_CHECKSIG', }
heightConfirmed: 0} } }]);
]);
callback(); callback();
}); });
}); });
@ -113,52 +112,46 @@ describe('TransactionService', function() {
k.value = JSON.parse(k.value); k.value = JSON.parse(k.value);
} }
return k; return k;
}).should.deep.equal([ }).should.deep.equal([{
{ type: 'put', type: 'put',
key: 'btx-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16', key: 'btx-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16',
value: '00000000d1145790a8694403d4063f323d499e655c83426834d4ce2f8dd4a2ee' }, value: '00000000d1145790a8694403d4063f323d499e655c83426834d4ce2f8dd4a2ee'
{ type: 'put', }, {
key: 'txo-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-0', type: 'put',
value: key: 'txo-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-0',
{ satoshis: 1000000000, value: {
script: '65 0x04ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c OP_CHECKSIG' } }, satoshis: 1000000000,
{ type: 'put', script: '65 0x04ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c OP_CHECKSIG'
key: 'txa-1Q2TWHE3GMdB6BZKafqwxXtWAWgFt5Jvm3-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-0', }
value: }, {
{ satoshis: 1000000000, type: 'put',
script: '65 0x04ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c OP_CHECKSIG', key: 'txo-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-1',
heightConfirmed: 170 } }, value: {
{ type: 'put', satoshis: 4000000000,
key: 'txo-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-1', script: '65 0x0411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3 OP_CHECKSIG'
value: }
{ satoshis: 4000000000, }, {
script: '65 0x0411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3 OP_CHECKSIG' } }, type: 'put',
{ type: 'put', key: 'txo-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-0',
key: 'txa-12cbQLTFMXRnSzktFkuoG3eHoMeFtpTu3S-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-1', value: {
value: prevTxId: '0437cd7f8525ceed2324359c2d0ba26006d92d856a9c20fa0241106ee5a597c9',
{ satoshis: 4000000000, outputIndex: 0,
script: '65 0x0411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3 OP_CHECKSIG', sequenceNumber: 4294967295,
heightConfirmed: 170 } }, script: '71 0x304402204e45e16932b8af514961a1d3a1a25fdf3f4f7732e9d624c6c61548ab5fb8cd410220181522ec8eca07de4860a4acdd12909d831cc56cbbac4622082221a8768d1d0901',
{ type: 'put', heightConfirmed: 170
key: 'txo-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-0', }
value: }, ]);
{ prevTxId: '0437cd7f8525ceed2324359c2d0ba26006d92d856a9c20fa0241106ee5a597c9', /* TODO: This should work if address spent is accepted for public key. Add test for P2PKH if not accepted
* { type: 'put',
key: 'txas-12cbQLTFMXRnSzktFkuoG3eHoMeFtpTu3S-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-0',
value:
{ heightSpent: 170,
spentTx: 'f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16',
spentTxInputIndex: 0,
spendInput: { prevTxId: '0437cd7f8525ceed2324359c2d0ba26006d92d856a9c20fa0241106ee5a597c9',
outputIndex: 0, outputIndex: 0,
sequenceNumber: 4294967295, sequenceNumber: 4294967295,
script: '71 0x304402204e45e16932b8af514961a1d3a1a25fdf3f4f7732e9d624c6c61548ab5fb8cd410220181522ec8eca07de4860a4acdd12909d831cc56cbbac4622082221a8768d1d0901', script: '71 0x304402204e45e16932b8af514961a1d3a1a25fdf3f4f7732e9d624c6c61548ab5fb8cd410220181522ec8eca07de4860a4acdd12909d831cc56cbbac4622082221a8768d1d0901' }}}]);*/
heightConfirmed: 170 } },
]);
/* TODO: This should work if address spent is accepted for public key. Add test for P2PKH if not accepted
* { type: 'put',
key: 'txas-12cbQLTFMXRnSzktFkuoG3eHoMeFtpTu3S-f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16-0',
value:
{ heightSpent: 170,
spentTx: 'f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16',
spentTxInputIndex: 0,
spendInput: { prevTxId: '0437cd7f8525ceed2324359c2d0ba26006d92d856a9c20fa0241106ee5a597c9',
outputIndex: 0,
sequenceNumber: 4294967295,
script: '71 0x304402204e45e16932b8af514961a1d3a1a25fdf3f4f7732e9d624c6c61548ab5fb8cd410220181522ec8eca07de4860a4acdd12909d831cc56cbbac4622082221a8768d1d0901' }}}]);*/
callback(); callback();
}); });
}); });