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

fix conflics

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-06-17 16:25:38 -03:00
commit cd71ce4421
25 changed files with 268 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,15 +1,17 @@
'use strict';
var imports = require('soop').imports();
var Storage = imports.Storage;
var Network = imports.Network;
var Blockchain = imports.Blockchain;
var TxProposals = require('./TxProposals');
var PublicKeyRing = require('./PublicKeyRing');
var PrivateKey = require('./PrivateKey');
var Wallet = require('./Wallet');
var WebRTC = module.exports.WebRTC = require('../network/WebRTC');
var Insight = module.exports.Insight = require('../blockchain/Insight');
//var StorageLocalPlain = module.exports.StorageLocalPlain = require('../storage/LocalPlain');
var StorageLocalEncrypted = module.exports.StorageLocalEncrypted = require('../storage/LocalEncrypted');
/*
* WalletFactory
*
@ -19,9 +21,13 @@ function WalletFactory(config, version) {
var self = this;
config = config || {};
this.storage = config.storageObj || new Storage(config.storage);
this.network = config.networkObj || new Network(config.network);
this.blockchain = config.blockchainObj || new Blockchain(config.blockchain);
this.Storage = config.Storage || StorageLocalEncrypted;
this.Network = config.Network || WebRTC;
this.Blockchain = config.Blockchain || Insight;
this.storage = new this.Storage(config.storage);
this.network = new this.Network(config.network);
this.blockchain = new this.Blockchain(config.blockchain);
this.networkName = config.networkName;
this.verbose = config.verbose;