From cfa5748f745417f8b0ccb868c319e4fb81edbe50 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 2 Dec 2014 11:17:03 -0300 Subject: [PATCH] mv log to util --- copay.js | 2 +- js/models/Async.js | 2 +- js/models/Compatibility.js | 2 +- js/models/Identity.js | 13 +++++++------ js/models/Insight.js | 8 +++++--- js/models/PluginManager.js | 2 +- js/models/PublicKeyRing.js | 2 +- js/models/RateService.js | 2 +- js/models/TxProposal.js | 2 +- js/models/TxProposals.js | 2 +- js/models/Wallet.js | 2 +- js/plugins/EncryptedInsightStorage.js | 2 +- js/plugins/EncryptedLocalStorage.js | 2 +- js/plugins/GoogleDrive.js | 2 +- js/plugins/InsightStorage.js | 2 +- js/util/crypto.js | 3 ++- js/{ => util}/log.js | 4 +++- util/build.js | 4 ++-- 18 files changed, 32 insertions(+), 26 deletions(-) rename js/{ => util}/log.js (96%) diff --git a/copay.js b/copay.js index 79a70f8b0..fc4f7d4ec 100644 --- a/copay.js +++ b/copay.js @@ -6,7 +6,7 @@ module.exports.PrivateKey = require('./js/models/PrivateKey'); module.exports.HDPath = require('./js/models/HDPath'); module.exports.HDParams = require('./js/models/HDParams'); module.exports.crypto = require('./js/util/crypto'); -module.exports.logger = require('./js/log'); +module.exports.logger = require('./js/util/log'); // components diff --git a/js/models/Async.js b/js/models/Async.js index 067cc50f1..505b7826e 100644 --- a/js/models/Async.js +++ b/js/models/Async.js @@ -2,7 +2,7 @@ var EventEmitter = require('events').EventEmitter; var bitcore = require('bitcore'); -var log = require('../log'); +var log = require('../util/log'); var AuthMessage = bitcore.AuthMessage; var util = bitcore.util; var nodeUtil = require('util'); diff --git a/js/models/Compatibility.js b/js/models/Compatibility.js index d42eb9be0..bab4f5b57 100644 --- a/js/models/Compatibility.js +++ b/js/models/Compatibility.js @@ -5,7 +5,7 @@ var Wallet = require('./Wallet'); var cryptoUtils = require('../util/crypto'); var CryptoJS = require('node-cryptojs-aes').CryptoJS; var sjcl = require('../../lib/sjcl'); -var log = require('../log'); +var log = require('../util/log'); var preconditions = require('preconditions').instance(); var _ = require('lodash'); diff --git a/js/models/Identity.js b/js/models/Identity.js index 8062b3ba9..2b72c6c10 100644 --- a/js/models/Identity.js +++ b/js/models/Identity.js @@ -3,7 +3,7 @@ var _ = require('lodash'); var preconditions = require('preconditions').singleton(); var inherits = require('inherits'); var events = require('events'); -var log = require('../log'); +var log = require('../util/log'); var async = require('async'); var bitcore = require('bitcore'); @@ -122,7 +122,7 @@ Identity.open = function(opts, cb) { var storage = opts.storage || opts.pluginManager.get('DB'); storage.setCredentials(opts.email, opts.password, opts); - storage.getItem(Identity.getKeyForEmail(opts.email), function(err, data, headers) { + storage.getItem(Identity.getKeyForEmail(opts.email), function(err, data) { var exported; if (err) { return cb(err); @@ -132,7 +132,7 @@ Identity.open = function(opts, cb) { } catch (e) { return cb(e); } - return cb(null, new Identity(_.extend(opts, exported)), headers); + return cb(null, new Identity(_.extend(opts, exported))); }); }; @@ -553,8 +553,8 @@ Identity.prototype.createWallet = function(opts, cb) { var self = this; var w = new walletClass(opts); - self.bindWallet(w); self.updateFocusedTimestamp(w.getId()); + self.bindWallet(w); self.storeWallet(w, function(err) { if (err) return cb(err); self.store({ @@ -619,10 +619,11 @@ Identity.prototype.deleteWallet = function(walletId, cb) { delete this.focusedTimestamps[walletId]; this.storage.removeItem(Wallet.getStorageKey(walletId), function(err) { - if (err) return cb(err); + if (err) { + return cb(err); + } self.emitAndKeepAlive('deletedWallet', walletId); self.store(null, cb); - return cb(); }); }; diff --git a/js/models/Insight.js b/js/models/Insight.js index e1cde179a..d07484f59 100644 --- a/js/models/Insight.js +++ b/js/models/Insight.js @@ -3,14 +3,16 @@ var util = require('util'); var async = require('async'); var request = require('request'); -var bitcore = require('bitcore'); var io = require('socket.io-client'); var _ = require('lodash'); -var log = require('../log'); - var EventEmitter = require('events').EventEmitter; var preconditions = require('preconditions').singleton(); +var bitcore = require('bitcore'); + +var log = require('../util/log.js'); + + /* This class lets interfaces with the blockchain, making general queries and subscribing to transactions on adressess and blocks. diff --git a/js/models/PluginManager.js b/js/models/PluginManager.js index 2a2788b61..d2d8d57fc 100644 --- a/js/models/PluginManager.js +++ b/js/models/PluginManager.js @@ -1,6 +1,6 @@ 'use strict'; var preconditions = require('preconditions').singleton(); -var log = require('../log'); +var log = require('../util/log'); function PluginManager(config) { this.registered = {}; diff --git a/js/models/PublicKeyRing.js b/js/models/PublicKeyRing.js index 6963e8bab..8b1efb994 100644 --- a/js/models/PublicKeyRing.js +++ b/js/models/PublicKeyRing.js @@ -2,7 +2,7 @@ var preconditions = require('preconditions').instance(); var _ = require('lodash'); -var log = require('../log'); +var log = require('../util/log'); var bitcore = require('bitcore'); var HK = bitcore.HierarchicalKey; var Address = bitcore.Address; diff --git a/js/models/RateService.js b/js/models/RateService.js index c0819f8c2..aec56366d 100644 --- a/js/models/RateService.js +++ b/js/models/RateService.js @@ -2,7 +2,7 @@ var util = require('util'); var _ = require('lodash'); -var log = require('../log'); +var log = require('../util/log'); var preconditions = require('preconditions').singleton(); var request = require('request'); diff --git a/js/models/TxProposal.js b/js/models/TxProposal.js index 036dd5b63..8f4fe53c7 100644 --- a/js/models/TxProposal.js +++ b/js/models/TxProposal.js @@ -10,7 +10,7 @@ var TransactionBuilder = bitcore.TransactionBuilder; var Script = bitcore.Script; var Key = bitcore.Key; -var log = require('../log'); +var log = require('../util/log'); var TX_MAX_SIZE_KB = 50; var VERSION = 1; diff --git a/js/models/TxProposals.js b/js/models/TxProposals.js index 477f276a2..074091ad5 100644 --- a/js/models/TxProposals.js +++ b/js/models/TxProposals.js @@ -9,7 +9,7 @@ var Script = bitcore.Script; var Key = bitcore.Key; var buffertools = bitcore.buffertools; -var log = require('../log'); +var log = require('../util/log'); var TxProposal = require('./TxProposal');; function TxProposals(opts) { diff --git a/js/models/Wallet.js b/js/models/Wallet.js index be28d3808..947d20e72 100644 --- a/js/models/Wallet.js +++ b/js/models/Wallet.js @@ -18,7 +18,7 @@ var Address = bitcore.Address; var PayPro = bitcore.PayPro; var Transaction = bitcore.Transaction; -var log = require('../log'); +var log = require('../util/log'); var cryptoUtil = require('../util/crypto'); var httpUtil = require('../util/HTTP'); var HDParams = require('./HDParams'); diff --git a/js/plugins/EncryptedInsightStorage.js b/js/plugins/EncryptedInsightStorage.js index 0081dc0e3..d6fd4f0f7 100644 --- a/js/plugins/EncryptedInsightStorage.js +++ b/js/plugins/EncryptedInsightStorage.js @@ -1,7 +1,7 @@ var cryptoUtil = require('../util/crypto'); var InsightStorage = require('./InsightStorage'); var inherits = require('inherits'); -var log = require('../log'); +var log = require('../util/log'); var SEPARATOR = '%^#@'; function EncryptedInsightStorage(config) { diff --git a/js/plugins/EncryptedLocalStorage.js b/js/plugins/EncryptedLocalStorage.js index 89c104cab..591308f17 100644 --- a/js/plugins/EncryptedLocalStorage.js +++ b/js/plugins/EncryptedLocalStorage.js @@ -1,5 +1,5 @@ var cryptoUtil = require('../util/crypto'); -var log = require('../log'); +var log = require('../util/log'); var LocalStorage = require('./LocalStorage'); var inherits = require('inherits'); diff --git a/js/plugins/GoogleDrive.js b/js/plugins/GoogleDrive.js index 599314961..b786fca4b 100644 --- a/js/plugins/GoogleDrive.js +++ b/js/plugins/GoogleDrive.js @@ -3,7 +3,7 @@ var preconditions = require('preconditions').singleton(); var loaded = 0; var SCOPES = 'https://www.googleapis.com/auth/drive'; -var log = require('../log'); +var log = require('../util/log'); function GoogleDrive(config) { preconditions.checkArgument(config && config.clientId, 'No clientId at GoogleDrive config'); diff --git a/js/plugins/InsightStorage.js b/js/plugins/InsightStorage.js index 26f5fda2f..522444c3e 100644 --- a/js/plugins/InsightStorage.js +++ b/js/plugins/InsightStorage.js @@ -4,7 +4,7 @@ var bitcore = require('bitcore'); var buffers = require('buffer'); var querystring = require('querystring'); var Identity = require('../models/Identity'); -var log = require('../log'); +var log = require('../util/log'); var SEPARATOR = '|'; diff --git a/js/util/crypto.js b/js/util/crypto.js index 3497207f6..cb438ea18 100644 --- a/js/util/crypto.js +++ b/js/util/crypto.js @@ -2,8 +2,9 @@ * Small module for some helpers that wrap sjcl with some good practices. */ var sjcl = require('sjcl'); -var log = require('../log.js'); var _ = require('lodash'); + +var log = require('../util/log.js'); var config = require('../../config'); var defaultSalt = (config && config.passphraseConfig && config.passphraseConfig.storageSalt) || 'mjuBtGybi/4='; diff --git a/js/log.js b/js/util/log.js similarity index 96% rename from js/log.js rename to js/util/log.js index 1d7c7c776..33b900e3e 100644 --- a/js/log.js +++ b/js/util/log.js @@ -1,5 +1,7 @@ -var config = config || require('../config'); +var config = config || require('../../config'); var _ = require('lodash'); +var LS = require('../plugins/LocalStorage'); +var ls = new LS(); /** diff --git a/util/build.js b/util/build.js index f3fb38c7b..cad8dc831 100644 --- a/util/build.js +++ b/util/build.js @@ -109,8 +109,8 @@ var createBundle = function(opts) { // The following 2 lines fix karma tests b.require('sjcl'); - b.require('./js/log', { - expose: '../log.js' + b.require('./js/util/log', { + expose: '../../log.js' }); if (opts.debug) {