Merge pull request #1466 from matiaspando/moveFiles

Move files to /js/models

API.js

@@ -1,4 +1,4 @@
-var WalletFactory = require('./js/models/core/WalletFactory');
+var WalletFactory = require('./js/models/WalletFactory');
 
 var API = function(opts) {
   this._init(opts);

Gruntfile.js

@@ -64,7 +64,6 @@ module.exports = function(grunt) {
       },
       scripts: {
         files: [
-          'js/models/**/*.js',
           'js/models/*.js',
           'plugins/*.js',
         ],
@@ -202,7 +201,7 @@ module.exports = function(grunt) {
     },
     jsdoc: {
       dist: {
-        src: ['js/models/core/*.js', 'js/models/*.js', 'plugins/*.js'],
+        src: ['js/models/*.js', 'plugins/*.js'],
         options: {
           destination: 'doc',
           configure: 'jsdoc.conf.json',

copay.js

@@ -1,22 +1,22 @@
 // core
-module.exports.PublicKeyRing = require('./js/models/core/PublicKeyRing');
-module.exports.TxProposal = require('./js/models/core/TxProposal');
-module.exports.TxProposals = require('./js/models/core/TxProposals');
-module.exports.PrivateKey = require('./js/models/core/PrivateKey');
-module.exports.Passphrase = require('./js/models/core/Passphrase');
-module.exports.HDPath = require('./js/models/core/HDPath');
-module.exports.HDParams = require('./js/models/core/HDParams');
+module.exports.PublicKeyRing = require('./js/models/PublicKeyRing');
+module.exports.TxProposal = require('./js/models/TxProposal');
+module.exports.TxProposals = require('./js/models/TxProposals');
+module.exports.PrivateKey = require('./js/models/PrivateKey');
+module.exports.Passphrase = require('./js/models/Passphrase');
+module.exports.HDPath = require('./js/models/HDPath');
+module.exports.HDParams = require('./js/models/HDParams');
 
 
 // components
-var Async = module.exports.Async = require('./js/models/network/Async');
-var Insight = module.exports.Insight = require('./js/models/blockchain/Insight');
+var Async = module.exports.Async = require('./js/models/Async');
+var Insight = module.exports.Insight = require('./js/models/Insight');
 var Storage = module.exports.Storage = require('./js/models/Storage');
 
-module.exports.WalletFactory = require('./js/models/core/WalletFactory');
-module.exports.Wallet = require('./js/models/core/Wallet');
-module.exports.WalletLock = require('./js/models/core/WalletLock');
-module.exports.PluginManager = require('./js/models/core/PluginManager');
+module.exports.WalletFactory = require('./js/models/WalletFactory');
+module.exports.Wallet = require('./js/models/Wallet');
+module.exports.WalletLock = require('./js/models/WalletLock');
+module.exports.PluginManager = require('./js/models/PluginManager');
 module.exports.version = require('./version').version;
 module.exports.commitHash = require('./version').commitHash;
 

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');

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;
@@ -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,7 +566,8 @@ PublicKeyRing.prototype.copayersForPubkeys = function(pubkeys, paths) {
   preconditions.checkArgument(pubkeys);
   preconditions.checkArgument(paths);
 
-  var inKeyMap = {}, ret = {};
+  var inKeyMap = {},
+    ret = {};
   for (var i in pubkeys) {
     inKeyMap[pubkeys[i]] = 1;
   };
@@ -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

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

test/test.HDPath.js

@@ -8,7 +8,7 @@ try {
 } catch (e) {
   var copay = require('../copay'); //node
 }
-var HDPath = require('../js/models/core/HDPath');
+var HDPath = require('../js/models/HDPath');
 
 describe('HDPath model', function() {
   it('should have the correct constants', function() {

test/test.PrivateKey.js

@@ -16,7 +16,7 @@ try {
 } catch (e) {
   var copay = require('../copay'); //node
 }
-var PrivateKey = copay.PrivateKey || require('../js/models/core/PrivateKey');
+var PrivateKey = copay.PrivateKey || require('../js/models/PrivateKey');
 
 var pkConfig = {
   networkName: 'livenet',

test/test.PublicKeyRing.js

@@ -6,7 +6,7 @@ var bitcore = bitcore || require('bitcore');
 var Address = bitcore.Address;
 var buffertools = bitcore.buffertools;
 
-var HDPath = require('../js/models/core/HDPath');
+var HDPath = require('../js/models/HDPath');
 
 try {
   var copay = require('copay'); //browser
@@ -441,11 +441,9 @@ describe('PublicKeyRing model', function() {
     };
     var pkr = new PublicKeyRing(config);
 
-    (function () 
-    {
+    (function() {
       PublicKeyRing.fromObj(pkr);
-    }
-    ).should.throw('bad data format: Did you use .toObj()?');  
+    }).should.throw('bad data format: Did you use .toObj()?');
   });
 
 

test/test.WalletFactory.js

@@ -10,13 +10,13 @@ var sinon = require('sinon');
 var FakeNetwork = require('./mocks/FakeNetwork');
 var FakeBlockchain = require('./mocks/FakeBlockchain');
 var FakeStorage = function FakeStorage() {};
-var WalletFactory = require('../js/models/core/WalletFactory');
-var Passphrase = require('../js/models/core/Passphrase');
+var WalletFactory = require('../js/models/WalletFactory');
+var Passphrase = require('../js/models/Passphrase');
 var mockLocalStorage = require('./mocks/FakeLocalStorage');
 var mockSessionStorage = require('./mocks/FakeLocalStorage');
 
 
-var PERSISTED_PROPERTIES = (copay.Wallet || require('../js/models/core/Wallet')).PERSISTED_PROPERTIES;
+var PERSISTED_PROPERTIES = (copay.Wallet || require('../js/models/Wallet')).PERSISTED_PROPERTIES;
 
 function assertObjectEqual(a, b) {
   PERSISTED_PROPERTIES.forEach(function(k) {

test/test.performance.js

@@ -2,8 +2,8 @@
 
 var chai = chai || require('chai');
 var should = chai.should();
-var PrivateKey = require('../js/models/core/PrivateKey');
-var PublicKeyRing = require('../js/models/core/PublicKeyRing');
+var PrivateKey = require('../js/models/PrivateKey');
+var PublicKeyRing = require('../js/models/PublicKeyRing');
 
 var getNewEpk = function() {
   return new PrivateKey({

util/build.js

@@ -58,33 +58,33 @@ var createBundle = function(opts) {
     expose: '../js/log'
   });
   //  b.external('bitcore');
-  b.require('./js/models/core/WalletFactory', {
-    expose: '../js/models/core/WalletFactory'
+  b.require('./js/models/WalletFactory', {
+    expose: '../js/models/WalletFactory'
   });
-  b.require('./js/models/core/Wallet');
-  b.require('./js/models/core/Wallet', {
-    expose: '../../js/models/core/Wallet'
+  b.require('./js/models/Wallet');
+  b.require('./js/models/Wallet', {
+    expose: '../../js/models/Wallet'
   });
-  b.require('./js/models/core/WalletLock', {
-    expose: '../js/models/core/WalletLock'
+  b.require('./js/models/WalletLock', {
+    expose: '../js/models/WalletLock'
   });
-  b.require('./js/models/blockchain/Insight', {
-    expose: '../js/models/blockchain/Insight'
+  b.require('./js/models/Insight', {
+    expose: '../js/models/Insight'
   });
-  b.require('./js/models/core/PrivateKey', {
-    expose: '../js/models/core/PrivateKey'
+  b.require('./js/models/PrivateKey', {
+    expose: '../js/models/PrivateKey'
   });
-  b.require('./js/models/core/PublicKeyRing', {
-    expose: '../js/models/core/PublicKeyRing'
+  b.require('./js/models/PublicKeyRing', {
+    expose: '../js/models/PublicKeyRing'
   });
-  b.require('./js/models/core/Passphrase', {
-    expose: '../js/models/core/Passphrase'
+  b.require('./js/models/Passphrase', {
+    expose: '../js/models/Passphrase'
   });
-  b.require('./js/models/core/HDPath', {
-    expose: '../js/models/core/HDPath'
+  b.require('./js/models/HDPath', {
+    expose: '../js/models/HDPath'
   });
-  b.require('./js/models/core/PluginManager', {
-    expose: '../js/models/core/PluginManager'
+  b.require('./js/models/PluginManager', {
+    expose: '../js/models/PluginManager'
   });
 
   if (!opts.disablePlugins) {

util/find_m_n.js

@@ -6,14 +6,14 @@ var async = require('async');
 var bitcore = require('bitcore');
 var chai = require('chai');
 var should = chai.should();
-var PublicKeyRing = require('../js/models/core/PublicKeyRing');
-var PrivateKey = require('../js/models/core/PrivateKey');
+var PublicKeyRing = require('../js/models/PublicKeyRing');
+var PrivateKey = require('../js/models/PrivateKey');
 
 var FakeNetwork = require('../test/mocks/FakeNetwork');
 var Insight = require('../js/models/blockchain/Insight');
 var FakeStorage = require('../test/mocks/FakeStorage');
 
-var WalletFactory = require('soop').load('../js/models/core/WalletFactory', {
+var WalletFactory = require('soop').load('../js/models/WalletFactory', {
   Network: FakeNetwork,
   Blockchain: Insight,
   Storage: FakeStorage,