Move files to /model

This commit is contained in:
Matias Pando 2014-09-23 15:24:57 -03:00
commit 06c83a8aba
24 changed files with 133 additions and 130 deletions

View file

@ -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) {
@ -95,7 +95,7 @@ var createBundle = function(opts) {
expose: '../plugins/LocalStorage'
});
}
b.require('./config', {
expose: '../config'
});

View file

@ -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,
@ -34,7 +34,7 @@ for (var n = 1; n <= N_LIMIT; n++) {
// case m-of-n
console.log('case ' + m + '-of-' + n);
var pair = [m, n];
for (var iter = 0; iter <= ITERS*n; iter++) {
for (var iter = 0; iter <= ITERS * n; iter++) {
// create full pkr
var publicKeyRing = new PublicKeyRing({
networkName: nn,
@ -108,11 +108,11 @@ for (var n = 1; n <= N_LIMIT; n++) {
}
var size = maxs[pair];
console.log('\tmax size: '+size);
console.log('\tmax size: ' + size);
var m_valid = false;
if (size < 500) {
m_valid = true;
valid[[m,n]] = size;
valid[[m, n]] = size;
}
if (!m_valid) break;
}