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

settings: nuke verbose 2

Browse source
This commit is contained in:
Manuel Araoz 2014-09-03 13:17:59 -03:00
commit f9a31ce9aa
7 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/models/core/Settings.js
View file

@ -9,4 +9,10 @@ function Settings(opts) {
var self = this;
}
Settings.prototype.toObj = function() {
return {
}
};
module.exports = Settings;

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

@ -799,6 +799,7 @@ Wallet.prototype.toObj = function() {
var walletObj = {
opts: optsObj,
settings: this.settings.toObj();
networkNonce: networkNonce, //yours
networkNonces: networkNonces, //copayers
publicKeyRing: this.publicKeyRing.toObj(),
@ -832,6 +833,7 @@ Wallet.fromObj = function(o, storage, network, blockchain) {
var opts = JSON.parse(JSON.stringify(o.opts));
opts.addressBook = o.addressBook;
opts.settings = o.settings;
if (o.privateKey) {
opts.privateKey = PrivateKey.fromObj(o.privateKey);
@ -2523,4 +2525,4 @@ Wallet.request = function(options, callback) {
return ret;
};
module.exports = Wallet;
module.exports = Wallet;

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

@ -95,7 +95,6 @@ WalletFactory.prototype.fromObj = function(obj, skipFields) {
var w = Wallet.fromObj(obj, this.storage, this.network, this.blockchain);
if (!w) return false;
w.verbose = this.verbose;
this._checkVersion(w.version);
this._checkNetwork(w.getNetworkName());
return w;
@ -217,7 +216,6 @@ WalletFactory.prototype.create = function(opts) {
opts.storage = this.storage;
opts.network = this.network;
opts.blockchain = this.blockchain;
opts.verbose = this.verbose;
opts.spendUnconfirmed = opts.spendUnconfirmed || this.walletDefaults.spendUnconfirmed;
opts.reconnectDelay = opts.reconnectDelay || this.walletDefaults.reconnectDelay;