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

Remove forceNetwork

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2014-09-15 10:16:40 -03:00
commit d85fcbfe07
4 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config.js
View file

@ -3,7 +3,6 @@ var defaultConfig = {
defaultLanguage: 'en', defaultLanguage: 'en',
// DEFAULT network (livenet or testnet) // DEFAULT network (livenet or testnet)
networkName: 'testnet', networkName: 'testnet',
forceNetwork: false,
logLevel: 'info', logLevel: 'info',

3
js/app.js
View file

@ -10,9 +10,6 @@ if (localConfig) {
var lmv = localConfig.version ? localConfig.version.split('.')[1] : '-1'; var lmv = localConfig.version ? localConfig.version.split('.')[1] : '-1';
if (cmv === lmv) { if (cmv === lmv) {
_.each(localConfig, function(value, key) { _.each(localConfig, function(value, key) {
if (key === 'networkName' && config['forceNetwork']) {
return;
}
config[key] = value; config[key] = value;
}); });
} }

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

@ -67,9 +67,6 @@ function Wallet(opts) {
preconditions.checkArgument(!_.isUndefined(opts[k]), 'missing required option for Wallet: ' + k); preconditions.checkArgument(!_.isUndefined(opts[k]), 'missing required option for Wallet: ' + k);
self[k] = opts[k]; self[k] = opts[k];
}); });
preconditions.checkArgument(!copayConfig.forceNetwork || this.getNetworkName() === copayConfig.networkName,
'Network forced to ' + copayConfig.networkName +
' and tried to create a Wallet with network ' + this.getNetworkName());
this.id = opts.id || Wallet.getRandomId(); this.id = opts.id || Wallet.getRandomId();
this.secretNumber = opts.secretNumber || Wallet.getRandomNumber(); this.secretNumber = opts.secretNumber || Wallet.getRandomNumber();

9
test/test.Wallet.js
View file

@ -1247,15 +1247,6 @@ describe('Wallet model', function() {
}); });
describe('#forceNetwork in config', function() {
it('should throw if network is different', function() {
var backup = copayConfig.forceNetwork;
copayConfig.forceNetwork = true;
walletConfig.networkName = 'livenet';
createW2.should.throw(Error);
copayConfig.forceNetwork = backup;
});
});
describe('_getKeymap', function() { describe('_getKeymap', function() {
var w = cachedCreateW(); var w = cachedCreateW();