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

ALL TEST PASSING!!!

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-09-15 13:56:38 -03:00
commit 5cf4fe0b66
5 changed files with 184 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/models/core/WalletFactory.js
View file

@ -53,6 +53,7 @@ function WalletFactory(config, version, pluginManager) {
this.storage = new this.Storage(storageOpts);
<<<<<<< HEAD
this.networks = {
'livenet': new this.Network(config.network.livenet),
'testnet': new this.Network(config.network.testnet),
@ -63,6 +64,10 @@ function WalletFactory(config, version, pluginManager) {
};
this.walletDefaults = config.wallet;
=======
this.networkName = config.networkName;
this.walletDefaults = config.wallet || {};
>>>>>>> ALL TEST PASSING!!!
this.version = version;
};
@ -90,7 +95,6 @@ WalletFactory.prototype.fromObj = function(obj, skipFields) {
preconditions.checkState(networkName);
preconditions.checkArgument(obj);
// not stored options
obj.opts = obj.opts || {};
obj.opts.reconnectDelay = this.walletDefaults.reconnectDelay;
@ -418,7 +422,7 @@ WalletFactory.prototype.joinCreateSession = function(opts, cb) {
joinNetwork.start(opts, function() {
joinNetwork.greet(decodedSecret.pubKey, opts.secretNumber);
joinNetwork.on('data', function(sender, data) {
if (data.type === 'walletId') {
if (data.type === 'walletId' && data.opts) {
if (data.networkName !== decodedSecret.networkName) {
return cb('badNetwork');
}