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

remove console.logs

Browse source
This commit is contained in:
Manuel Araoz 2014-06-03 18:38:56 -03:00
commit 7798e38253
18 changed files with 9 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/models/blockchain/Insight.js
View file

@ -150,10 +150,8 @@ Insight.prototype.sendRawTransaction = function(rawtx, cb) {
}
};
this._request(options, function(err, res) {
console.log('[Insight.js.73:err:]', err); //TODO
if (err) return cb();
console.log('[Insight.js.74]', res); //TODO
return cb(res.txid);
});
};

7
js/models/core/PublicKeyRing.js
View file

@ -13,10 +13,6 @@ var coinUtil = bitcore.util;
var Transaction = bitcore.Transaction
var util = bitcore.util;
var Storage = imports.Storage || require('../storage/Base.js');
var storage = Storage.default();
function PublicKeyRing(opts) {
opts = opts || {};
@ -165,8 +161,7 @@ PublicKeyRing.prototype.getPubKeys = function(index, isChange) {
PublicKeyRing.prototype._checkIndexRange = function (index, isChange) {
if ( (isChange && index > this.changeAddressIndex) ||
(!isChange && index > this.addressIndex)) {
console.log('Out of bounds at getAddress: Index %d isChange: %d', index, isChange);
throw new Error('index out of bound');
throw new Error('Out of bounds at getAddress: Index %d isChange: %d', index, isChange);
}
};

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

@ -10,9 +10,6 @@ var Builder = bitcore.TransactionBuilder;
var Script = bitcore.Script;
var buffertools = bitcore.buffertools;
var Storage = imports.Storage || require('../storage/Base');
var storage = Storage.default();
function TxProposal(opts) {
this.creator = opts.creator;
this.createdTs = opts.createdTs;

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

@ -245,11 +245,8 @@ Wallet.prototype.netStart = function() {
self.emit('ready', net.getPeer());
self.token = net.peer.options.token;
setTimeout(function() {
console.log('[EMIT publicKeyRingUpdated:]'); //TODO
self.emit('publicKeyRingUpdated', true);
console.log('[CONNECT:]'); //TODO
self.scheduleConnect();
console.log('[EMIT TxProposal]'); //TODO
self.emit('txProposalsUpdated');
self.store();
}, 10);

7
js/models/core/WalletFactory.js
View file

@ -31,8 +31,9 @@ function WalletFactory(config, version) {
WalletFactory.prototype.log = function(){
if (!this.verbose) return;
if (console)
console.log.apply(console, arguments);
if (console) {
console.log.apply(console, arguments);
}
};
@ -47,10 +48,8 @@ WalletFactory.prototype._checkRead = function(walletId) {
};
WalletFactory.prototype.fromObj = function(obj) {
console.log('## Decrypting'); //TODO
var w = Wallet.fromObj(obj, this.storage, this.network, this.blockchain);
w.verbose = this.verbose;
this.log('### WALLET OPENED:', w.id);
return w;
};

41
js/models/network/Base.js
View file

@ -1,41 +0,0 @@
var imports = require('soop').imports();
var EventEmitter = imports.EventEmitter || require('events').EventEmitter;
/*
* Emits
* 'networkChange'
* when network layout has change (new/lost peers, etc)
*
* 'data'
* when an unknown data type arrives
*
* Provides
* send(toPeerIds, {data}, cb?)
*
*/
function Network(opts) {
// TODO
}
Network.parent = EventEmitter;
// Allows subscribing to the following events:
// Network#on('networkChange', listener);
// Network#on('data', listener);
Network.prototype.start = function(callback) {
// TODO
};
Network.prototype.send = function(peerIds, data, cb) {
// TODO
};
Network.prototype.connectTo = function(peerId, openCallback, closeCallback) {
// TODO
};
Network.prototype.disconnect = function(peerId, cb) {
// TODO
};
module.exports = require('soop')(Network);

32
js/models/network/WebRTC.js
View file

@ -50,7 +50,6 @@ Network.prototype.cleanUp = function() {
this.copayerForPeer={};
this.connections={};
if (this.peer) {
console.log('## DESTROYING PEER INSTANCE'); //TODO
this.peer.disconnect();
this.peer.destroy();
this.peer = null;
@ -104,7 +103,6 @@ Network.prototype.connectedCopayers = function() {
};
Network.prototype._deletePeer = function(peerId) {
console.log('### Deleting connection from peer:', peerId);
delete this.isInboundPeerAuth[peerId];
delete this.copayerForPeer[peerId];
@ -127,17 +125,14 @@ Network.prototype.connectToCopayers = function(copayerIds) {
arrayDiff.forEach(function(copayerId) {
if (this.allowedCopayerIds && !this.allowedCopayerIds[copayerId]) {
console.log('### IGNORING STRANGE COPAYER:', copayerId);
this._deletePeer(this.peerFromCopayer(copayerId));
} else {
console.log('### CONNECTING TO:', copayerId);
self.connectTo(copayerId);
}
});
};
Network.prototype._sendHello = function(copayerId) {
console.log('### SENDING HELLO TO ', copayerId);
this.send(copayerId, {
type: 'hello',
copayerId: this.copayerId,
@ -158,25 +153,18 @@ Network.prototype._onData = function(encStr, isInbound, peerId) {
var data = this._decrypt(encStr);
payload= JSON.parse(data);
} catch (e) {
console.log('### ERROR IN DATA: "%s" ', data, isInbound, e);
this._deletePeer(peerId);
return;
}
console.log('### RECEIVED INBOUND?:%s TYPE: %s FROM %s',
isInbound, payload.type, peerId, payload);
if(isInbound && payload.type === 'hello') {
var payloadStr = JSON.stringify(payload);
if (this.allowedCopayerIds && !this.allowedCopayerIds[payload.copayerId]) {
console.log('#### Peer sent HELLO but it is not on the allowedCopayerIds. Closing connection',
this.allowedCopayerIds, payload.copayerId);
this._deletePeer(peerId);
return;
}
console.log('#### Peer sent hello. Setting it up.'); //TODO
this._addConnectedCopayer(payload.copayerId, isInbound);
this._setInboundPeerAuth(peerId, true);
return;
@ -199,7 +187,6 @@ Network.prototype._onData = function(encStr, isInbound, peerId) {
Network.prototype._checkAnyPeer = function() {
if (!this.connectedPeers.length) {
console.log('EMIT openError: no more peers, not even you!');
this.cleanUp();
this.emit('openError');
}
@ -219,9 +206,6 @@ Network.prototype._setupConnectionHandlers = function(dataConn, toCopayerId) {
self.connections[dataConn.peer] = dataConn;
console.log('### DATA CONNECTION READY: %s (inbound: %s) AUTHENTICATING...',
dataConn.peer, isInbound);
// The connecting peer send hello
if(toCopayerId) {
self.emit('connected');
@ -236,7 +220,6 @@ Network.prototype._setupConnectionHandlers = function(dataConn, toCopayerId) {
});
dataConn.on('error', function(e) {
console.log('### DATA ERROR', e); //TODO
self._onClose(dataConn.peer);
self._checkAnyPeer();
self.emit('dataError');
@ -245,7 +228,6 @@ Network.prototype._setupConnectionHandlers = function(dataConn, toCopayerId) {
dataConn.on('close', function() {
if (self.closing) return;
console.log('### CLOSE RECV FROM:', dataConn.peer);
self._onClose(dataConn.peer);
self._checkAnyPeer();
});
@ -263,18 +245,14 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
p.on('error', function(err) {
if (!err.message.match(/Could\snot\sconnect\sto peer/)) {
console.log('### PEER ERROR:', err);
self.emit('error', err);
}
self._checkAnyPeer();
});
p.on('connection', function(dataConn) {
console.log('### NEW INBOUND CONNECTION %d/%d', self.connectedPeers.length, self.maxPeers);
if (self.connectedPeers.length >= self.maxPeers) {
console.log('### PEER REJECTED. PEER MAX LIMIT REACHED');
dataConn.on('open', function() {
console.log('### CLOSING CONN FROM:' + dataConn.peer);
dataConn.close();
});
} else {
@ -288,11 +266,9 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
Network.prototype._addCopayerMap = function(peerId, copayerId) {
if (!this.copayerForPeer[peerId]) {
if(Object.keys(this.copayerForPeer).length < this.maxPeers) {
console.log('Adding peer/copayer', peerId, copayerId); //TODO
this.copayerForPeer[peerId]=copayerId;
}
else {
console.log('### maxPeerLimit of %d reached. Refusing to add more copayers.', this.maxPeers); //TODO
}
}
};
@ -333,7 +309,6 @@ Network.prototype.start = function(opts, openCallback) {
if (!this.copayerId)
this.setCopayerId(opts.copayerId);
console.log('CREATING PEER INSTANCE:', this.peerId); //TODO
this.peer = new Peer(this.peerId, this.opts);
this.started = true;
this._setupPeerHandlers(openCallback);
@ -378,9 +353,6 @@ Network.prototype._sendToOne = function(copayerId, payload, sig, cb) {
if (dataConn) {
dataConn.send(payload);
}
else {
console.log('[WebRTC.js.255] WARN: NO CONNECTION TO:', peerId); //TODO
}
}
if (typeof cb === 'function') cb();
};
@ -417,7 +389,6 @@ Network.prototype.connectTo = function(copayerId) {
var self = this;
var peerId = this.peerFromCopayer(copayerId);
console.log('### STARTING CONNECTION TO:\n\t'+ peerId+"\n\t"+ copayerId);
var dataConn = this.peer.connect(peerId, {
serialization: 'none',
reliable: true,
@ -426,9 +397,6 @@ Network.prototype.connectTo = function(copayerId) {
};
Network.prototype.lockIncommingConnections = function(allowedCopayerIdsArray) {
if (!this.allowedCopayerIds)
console.log('[webrtc] #### LOCKING INCOMMING CONNECTIONS');
this.allowedCopayerIds={};
for(var i in allowedCopayerIdsArray) {
this.allowedCopayerIds[ allowedCopayerIdsArray[i] ] = true;

38
js/models/storage/Base.js
View file

@ -1,38 +0,0 @@
'use strict';
var imports = require('soop').imports();
function Storage() {
}
// get value by key
Storage.prototype.get = function(walletId,k) {
};
// set value for key
Storage.prototype.set = function(walletId, k, v) {
};
// remove value for key
Storage.prototype.remove = function(walletId, k) {
};
Storage.prototype.getWalletIds = function() {
};
// obj contains keys to be set
Storage.prototype.setFromObj = function(walletId, obj) {
};
Storage.prototype.setFromEncryptedObj = function(walletId, obj) {
};
// wallet export - hex of encrypted wallet object
Storage.prototype.getEncryptedObj = function(walletId) {
};
// remove all values
Storage.prototype.clearAll = function() {
};
module.exports = require('soop')(Storage);

2
js/models/storage/File.js
View file

@ -1,7 +1,6 @@
'use strict';
var imports = require('soop').imports();
var fs = imports.fs || require('fs');
var parent = imports.parent || require('./Base');
var CryptoJS = require('node-cryptojs-aes').CryptoJS;
var passwords = [];
@ -12,7 +11,6 @@ function Storage(opts) {
this.data = {};
passwords[0] = opts.password;
}
Storage.parent = parent;
Storage.prototype._encrypt = function(string) {
var encrypted = CryptoJS.AES.encrypt(string, passwords[0]);

2
js/models/storage/LocalEncrypted.js
View file

@ -41,7 +41,7 @@ Storage.prototype._decrypt = function(base64) {
if (decrypted)
decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
} catch (e) {
console.log('Error while decrypting ' + base64);
// Error while decrypting
return null;
}
return decryptedStr;

2
js/models/storage/LocalPlain.js
View file

@ -1,11 +1,9 @@
'use strict';
var imports = require('soop').imports();
var parent = imports.parent || require('./Base');
function Storage() {
}
Storage.parent = parent;
Storage.prototype._read = function(k) {
var ret;