diff --git a/js/models/blockchain/Insight.js b/js/models/blockchain/Insight.js index d5692ac51..92f31bc47 100644 --- a/js/models/blockchain/Insight.js +++ b/js/models/blockchain/Insight.js @@ -182,7 +182,6 @@ Insight.prototype._request = function(options, callback) { request.open(options.method, url, true); request.timeout = 5000; request.ontimeout = function() { - console.log('Insight timeout...retrying'); setTimeout(function() { return self._request(options,callback); }, self.retryDelay); @@ -206,9 +205,7 @@ Insight.prototype._request = function(options, callback) { else { var err= 'Error code: ' + request.status + ' - Status: ' + request.statusText + ' - Description: ' + request.responseText; - console.log('Insight Temporary error (will retry):', err); setTimeout(function() { - console.log('### Retrying Insight Request....'); //TODO return self._request(options,callback); }, self.retryDelay); return callback(new Error(err)); diff --git a/js/models/core/PrivateKey.js b/js/models/core/PrivateKey.js index 7475f9146..1efe93694 100644 --- a/js/models/core/PrivateKey.js +++ b/js/models/core/PrivateKey.js @@ -58,7 +58,8 @@ PrivateKey.prototype._getHK = function(path) { if (typeof path === 'undefined') { return this.bip; } - return this.bip.derive(path); + var ret = this.bip.derive(path); + return ret; }; PrivateKey.prototype.getForPaths = function(paths) { diff --git a/js/models/core/PublicKeyRing.js b/js/models/core/PublicKeyRing.js index f449158cc..bc3148606 100644 --- a/js/models/core/PublicKeyRing.js +++ b/js/models/core/PublicKeyRing.js @@ -151,6 +151,7 @@ PublicKeyRing.prototype.getPubKeys = function(index, isChange) { pubKeys = pubKeys.map(function(s){return new Buffer(s,'hex');}); } + return pubKeys; }; diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js index e6d45201c..9f20ea35e 100644 --- a/js/models/core/Wallet.js +++ b/js/models/core/Wallet.js @@ -92,7 +92,7 @@ Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) { try{ hasChanged = this.publicKeyRing.merge(inPKR, true); } catch (e){ - console.log('## WALLET ERROR', e); //TODO + this.log('## WALLET ERROR', e); //TODO this.emit('connectionError', e.message); return; } diff --git a/test/test.TxProposals.js b/test/test.TxProposals.js index 52034627e..bf459ca01 100644 --- a/test/test.TxProposals.js +++ b/test/test.TxProposals.js @@ -141,8 +141,8 @@ describe('TxProposals model', function() { var signRet; if (priv) { - b.sign(priv.getAll(pkr.indexes.getReceiveIndex(), pkr.indexes.getChangeIndex())); - console.log('signed with priv'); + var pkeys = priv.getAll(pkr.indexes.getReceiveIndex(), pkr.indexes.getChangeIndex()); + b.sign(pkeys); } var me = {}; if (priv) me[priv.id] = Date.now(); @@ -299,11 +299,23 @@ describe('TxProposals model', function() { }; - it.only('#merge, merge signatures case 2', function() { + it('#merge, merge signatures case 2', function() { + + var o1 ={ extendedPrivateKeyString: 'tprv8ZgxMBicQKsPdSF1avR6mXyDj5Uv1XY2UyUHSDpAXQ5TvPN7prGeDppjy4562rBB9gMMAhRfFdJrNDpQ4t69kkqHNEEen3PX1zBJqSehJDH', + networkName: 'testnet', + privateKeyCache: {} }; + var o2 ={ extendedPrivateKeyString: 'tprv8ZgxMBicQKsPdVeB5RzuxS9JQcACueZYgUaM5eWzaEBkHjW5Pg6Mqez1APSqoUP1jUdbT8WVG7ZJYTXvUL7XtPzFYBXjmdKuwSor1dcNQ8j', + networkName: 'testnet', + privateKeyCache: {} }; + var o3 ={ extendedPrivateKeyString: 'tprv8ZgxMBicQKsPeHWNrPVZtQVgcCtXBr5TACNbDQ56rwqNJce9MEc64US6DJKxpWsrebEomxxWZFDtkvkZGkzA43uLvdF4XHiWqoNaL6Dq2Gd', + networkName: 'testnet', + privateKeyCache: {} }; + + + var priv = PrivateKey.fromObj(o1); + var priv2 = PrivateKey.fromObj(o2); + var priv3 = PrivateKey.fromObj(o3); - var priv = new PrivateKey(config); - var priv2 = new PrivateKey(config); - var priv3 = new PrivateKey(config); var ts = Date.now(); var isChange = 0; var index = 0; @@ -318,7 +330,6 @@ describe('TxProposals model', function() { unspentTest[0].scriptPubKey = pkr.getScriptPubKeyHex(index, isChange); var tx, txb; - /* var w = new TxProposals({ networkName: config.networkName, }); @@ -334,25 +345,21 @@ describe('TxProposals model', function() { var ntxid = Object.keys(w.txps)[0]; txb = w.txps[ntxid].builder; - console.log('new should A'); txb.signaturesAdded.should.equal(0); tx = txb.build(); - console.log('first should'); tx.isComplete().should.equal(false); - console.log('2 should'); tx.countInputMissingSignatures(0).should.equal(1); - console.log('3 should'); Object.keys(w.txps[ntxid].signedBy).length.should.equal(0); - console.log('4 should'); Object.keys(w.txps[ntxid].seenBy).length.should.equal(1); - */ var w2 = new TxProposals({ networkName: config.networkName, }); + + w2.add(createTx( '15q6HKjWHAksHcH91JW23BJEuzZgFwydBt', '123456789', @@ -365,32 +372,21 @@ describe('TxProposals model', function() { txb = w2.txps[ntxid].builder; tx = txb.build(); - console.log('new should B'); txb.signaturesAdded.should.equal(1); - console.log('5 should'); tx.isComplete().should.equal(false); - console.log('6 should'); tx.countInputMissingSignatures(0).should.equal(2); - return; - console.log('7 should'); (w2.txps[ntxid].signedBy[priv.id] - ts > 0).should.equal(true); - console.log('8 should'); (w2.txps[ntxid].seenBy[priv.id] - ts > 0).should.equal(true); w.merge(w2); - console.log('9 should'); Object.keys(w.txps).length.should.equal(1); - tx = w.txps[k].builder.build(); - console.log('10 should'); + tx = w.txps[ntxid].builder.build(); tx.isComplete().should.equal(false); - console.log('11 should'); tx.countInputMissingSignatures(0).should.equal(2); - console.log('12 should'); - (w.txps[k].signedBy[priv.id] - ts > 0).should.equal(true); - console.log('13 should'); - (w.txps[k].seenBy[priv.id] - ts > 0).should.equal(true); + (w.txps[ntxid].signedBy[priv.id] - ts > 0).should.equal(true); + (w.txps[ntxid].seenBy[priv.id] - ts > 0).should.equal(true); var w3 = new TxProposals({ @@ -405,36 +401,24 @@ describe('TxProposals model', function() { priv2, pkr )); - tx = w3.txps[k].builder.build(); - console.log('14 should'); + tx = w3.txps[ntxid].builder.build(); tx.isComplete().should.equal(false); - console.log('15 should'); tx.countInputMissingSignatures(0).should.equal(2); - console.log('16 should'); - (w3.txps[k].signedBy[priv2.id] - ts > 0).should.equal(true); - console.log('17 should'); - (w3.txps[k].seenBy[priv2.id] - ts > 0).should.equal(true); + (w3.txps[ntxid].signedBy[priv2.id] - ts > 0).should.equal(true); + (w3.txps[ntxid].seenBy[priv2.id] - ts > 0).should.equal(true); w.merge(w3); - console.log('18 should'); Object.keys(w.txps).length.should.equal(1); - console.log('19 should'); - (w.txps[k].signedBy[priv.id] - ts > 0).should.equal(true); - console.log('20 should'); - (w.txps[k].seenBy[priv.id] - ts > 0).should.equal(true); - console.log('21 should'); - (w.txps[k].signedBy[priv2.id] - ts > 0).should.equal(true); - console.log('22 should'); - (w.txps[k].seenBy[priv2.id] - ts > 0).should.equal(true); + (w.txps[ntxid].signedBy[priv.id] - ts > 0).should.equal(true); + (w.txps[ntxid].seenBy[priv.id] - ts > 0).should.equal(true); + (w.txps[ntxid].signedBy[priv2.id] - ts > 0).should.equal(true); + (w.txps[ntxid].seenBy[priv2.id] - ts > 0).should.equal(true); - tx = w.txps[k].builder.build(); - console.log('23 should'); + tx = w.txps[ntxid].builder.build(); tx.isComplete().should.equal(false); - console.log('24 should'); tx.countInputMissingSignatures(0).should.equal(1); - });