settings: nuke verbose 2

config.js

@@ -6,11 +6,6 @@ var defaultConfig = {
   forceNetwork: false,
   logLevel: 'info',
 
-  // DEFAULT unit: Bit
-  unitName: 'bits',
-  unitToSatoshi: 100,
-  alternativeName: 'US Dollar',
-  alternativeIsoCode: 'USD',
 
   // wallet limits
   limits: {
@@ -30,10 +25,14 @@ var defaultConfig = {
     requiredCopayers: 2,
     totalCopayers: 3,
     spendUnconfirmed: true,
-    verbose: 1,
-    // will duplicate itself after each try
     reconnectDelay: 5000,
-    idleDurationMin: 4
+    idleDurationMin: 4,
+    settings: {
+      unitName: 'bits',
+      unitToSatoshi: 100,
+      alternativeName: 'US Dollar',
+      alternativeIsoCode: 'USD',
+    }
   },
 
   // blockchain service API config
@@ -62,7 +61,6 @@ var defaultConfig = {
     updateFrequencySeconds: 60 * 60
   },
 
-  verbose: 1,
 };
 if (typeof module !== 'undefined')
-  module.exports = defaultConfig;
+  module.exports = defaultConfig;

js/models/core/Settings.js

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

js/models/core/Wallet.js

@@ -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;

js/models/core/WalletFactory.js

@@ -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;

test/test.PayPro.js

@@ -86,7 +86,6 @@ describe('PayPro (in Wallet) model', function() {
       };
 
       c.networkName = walletConfig.networkName;
-      c.verbose = walletConfig.verbose;
       c.version = '0.0.1';
 
       return new Wallet(c);

test/test.Wallet.js

@@ -102,7 +102,6 @@ describe('Wallet model', function() {
     };
 
     c.networkName = walletConfig.networkName;
-    c.verbose = walletConfig.verbose;
     c.version = '0.0.1';
 
 
@@ -1533,4 +1532,4 @@ describe('Wallet model', function() {
     should.exist(n.networkNonce);
   });
 
-});
+});

test/test.WalletFactory.js

@@ -290,7 +290,6 @@ describe('WalletFactory model', function() {
         "totalCopayers": 3,
         "reconnectDelay": 100,
         "spendUnconfirmed": 1,
-        "verbose": 0
       },
       "blockchain": {
         "host": "test.insight.is",
@@ -300,7 +299,6 @@ describe('WalletFactory model', function() {
         "host": "test.insight.is",
         "port": 3001
       },
-      "verbose": 0,
       "themes": ["default"],
     };
     var wf = new WalletFactory(sconfig, '0.0.1');