Move files to /model

js/models/Async.js

@@ -2,7 +2,7 @@
 
 var EventEmitter = require('events').EventEmitter;
 var bitcore = require('bitcore');
-var log = require('../../log');
+var log = require('../log');
 var AuthMessage = bitcore.AuthMessage;
 var util = bitcore.util;
 var nodeUtil = require('util');
@@ -236,7 +236,7 @@ Network.prototype._setupConnectionHandlers = function(opts, cb) {
   });
 
   self.socket.on('subscribed', function(m) {
-    var fromTs = (opts.lastTimestamp||0) + 1;
+    var fromTs = (opts.lastTimestamp || 0) + 1;
     self.socket.emit('sync', fromTs);
     self.started = true;
   });

js/models/Insight.js

@@ -5,7 +5,7 @@ var async = require('async');
 var request = require('request');
 var bitcore = require('bitcore');
 var io = require('socket.io-client');
-var log = require('../../log');
+var log = require('../log');
 
 var EventEmitter = require('events').EventEmitter;
 var preconditions = require('preconditions').singleton();

js/models/PluginManager.js

@@ -1,6 +1,6 @@
 'use strict';
 var preconditions = require('preconditions').singleton();
-var log = require('../../log');
+var log = require('../log');
 
 function PluginManager(config) {
   this.registered = {};

js/models/PublicKeyRing.js

@@ -2,7 +2,7 @@
 
 var preconditions = require('preconditions').instance();
 var _ = require('underscore');
-var log = require('../../log');
+var log = require('../log');
 var bitcore = require('bitcore');
 var HK = bitcore.HierarchicalKey;
 var Address = bitcore.Address;
@@ -40,7 +40,7 @@ function PublicKeyRing(opts) {
 
   this.indexes = opts.indexes ? HDParams.fromList(opts.indexes) : HDParams.init(this.totalCopayers);
 
-  this.publicKeysCache =  {};
+  this.publicKeysCache = {};
   this.nicknameFor = opts.nicknameFor || {};
   this.copayerIds = [];
   this.copayersBackup = opts.copayersBackup || [];
@@ -68,10 +68,10 @@ function PublicKeyRing(opts) {
  *                   as a parameter
  */
 PublicKeyRing.trim = function(data) {
- var opts = {};
+  var opts = {};
   ['walletId', 'networkName', 'requiredCopayers', 'totalCopayers',
-   'indexes','nicknameFor','copayersBackup', 'copayersExtPubKeys'
-  ].forEach(function(k){
+    'indexes', 'nicknameFor', 'copayersBackup', 'copayersExtPubKeys'
+  ].forEach(function(k) {
     opts[k] = data[k];
   });
   return opts;
@@ -259,7 +259,9 @@ PublicKeyRing.prototype.addCopayer = function(newHexaExtendedPublicKey, nickname
   preconditions.checkArgument(!this.isComplete());
   preconditions.checkArgument(!nickname || _.isString(nickname));
   preconditions.checkArgument(!_.any(this.copayersHK,
-    function(copayer) { return copayer.extendedPublicKeyString === newHexaExtendedPublicKey; }
+    function(copayer) {
+      return copayer.extendedPublicKeyString === newHexaExtendedPublicKey;
+    }
   ));
 
   var newCopayerIndex = this.copayersHK.length;
@@ -564,17 +566,18 @@ PublicKeyRing.prototype.copayersForPubkeys = function(pubkeys, paths) {
   preconditions.checkArgument(pubkeys);
   preconditions.checkArgument(paths);
 
-  var inKeyMap = {}, ret = {};
-  for(var i in pubkeys ){
+  var inKeyMap = {},
+    ret = {};
+  for (var i in pubkeys) {
     inKeyMap[pubkeys[i]] = 1;
   };
 
   var keys = this.getForPaths(paths);
-  for(var i in keys ){
-    for(var copayerIndex in keys[i] ){
+  for (var i in keys) {
+    for (var copayerIndex in keys[i]) {
       var kHex = keys[i][copayerIndex].toString('hex');
       if (inKeyMap[kHex]) {
-        ret[kHex] =this.copayerIds[copayerIndex];
+        ret[kHex] = this.copayerIds[copayerIndex];
         delete inKeyMap[kHex];
       }
     }
@@ -628,17 +631,17 @@ PublicKeyRing.prototype._checkInPKR = function(inPKR, ignoreId) {
 
   if (this.network.name !== inPKR.network.name)
     throw new Error('Network mismatch. Should be ' + this.network.name +
-                    ' and found ' + inPKR.network.name);
+      ' and found ' + inPKR.network.name);
 
   if (this.requiredCopayers && inPKR.requiredCopayers &&
-      (this.requiredCopayers !== inPKR.requiredCopayers))
+    (this.requiredCopayers !== inPKR.requiredCopayers))
     throw new Error('inPKR requiredCopayers mismatch ' + this.requiredCopayers +
-                    '!=' + inPKR.requiredCopayers);
+      '!=' + inPKR.requiredCopayers);
 
   if (this.totalCopayers && inPKR.totalCopayers &&
-      this.totalCopayers !== inPKR.totalCopayers)
+    this.totalCopayers !== inPKR.totalCopayers)
     throw new Error('inPKR totalCopayers mismatch' + this.totalCopayers +
-                    '!=' + inPKR.requiredCopayers);
+      '!=' + inPKR.requiredCopayers);
 
   return true;
 };
@@ -659,7 +662,9 @@ PublicKeyRing.prototype._mergePubkeys = function(inPKR) {
 
   inPKR.copayersHK.forEach(function(b) {
     var epk = b.extendedPublicKeyString();
-    var haveIt = _.any(self.copayersHK, function(hk) { return hk.extendedPublicKeyString() === epk; });
+    var haveIt = _.any(self.copayersHK, function(hk) {
+      return hk.extendedPublicKeyString() === epk;
+    });
 
     if (!haveIt) {
       if (self.isComplete()) {

js/models/Wallet.js

@@ -17,7 +17,7 @@ var Base58Check = bitcore.Base58.base58Check;
 var Address = bitcore.Address;
 var PayPro = bitcore.PayPro;
 var Transaction = bitcore.Transaction;
-var log = require('../../log');
+var log = require('../log');
 
 var HDParams = require('./HDParams');
 var PublicKeyRing = require('./PublicKeyRing');
@@ -25,7 +25,7 @@ var TxProposal = require('./TxProposal');
 var TxProposals = require('./TxProposals');
 var PrivateKey = require('./PrivateKey');
 var WalletLock = require('./WalletLock');
-var copayConfig = require('../../../config');
+var copayConfig = require('../../config');
 
 /**
  * @desc
@@ -2382,7 +2382,7 @@ Wallet.prototype.indexDiscovery = function(start, change, copayerIndex, gap, cb)
  * @desc Closes the wallet and disconnects all services
  */
 Wallet.prototype.close = function(cb) {
-  var self =this;
+  var self = this;
   log.debug('## CLOSING');
   this.lock.release(function() {
     self.network.cleanUp();

js/models/WalletFactory.js

@@ -6,12 +6,12 @@ var PublicKeyRing = require('./PublicKeyRing');
 var PrivateKey = require('./PrivateKey');
 var Wallet = require('./Wallet');
 var _ = require('underscore');
-var log = require('../../log');
+var log = require('../log');
 var PluginManager = require('./PluginManager');
-var Async = module.exports.Async = require('../network/Async');
-var Insight = module.exports.Insight = require('../blockchain/Insight');
+var Async = module.exports.Async = require('./Async');
+var Insight = module.exports.Insight = require('./Insight');
 var preconditions = require('preconditions').singleton();
-var Storage = module.exports.Storage = require('../Storage');
+var Storage = module.exports.Storage = require('./Storage');
 
 /**
  * @desc
@@ -427,7 +427,7 @@ WalletFactory.prototype.joinCreateSession = function(opts, cb) {
           return cb('badNetwork');
         }
 
-        var walletOpts =  _.clone(data.opts);
+        var walletOpts = _.clone(data.opts);
         walletOpts.id = data.walletId;
 
         walletOpts.privateKey = privateKey;