[Wallet][Model] Badly nStakeSplitThreshold set in optionsModel fixed + value moved to constant STAKE_SPLIT_THRESHOLD.

furszy · furszy · commit 1ebb669f2517 · 2019-09-06T11:56:05.000-03:00
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
@@ -136,12 +136,10 @@ void OptionsModel::setWalletDefaultOptions(QSettings& settings, bool reset){
         addOverriddenOption("-spendzeroconfchange");
 
     if (!settings.contains("nStakeSplitThreshold") || reset)
-        settings.setValue("nStakeSplitThreshold", 1);
-    if (reset){
-        setStakeSplitThreshold(1);
-    }
+        settings.setValue("nStakeSplitThreshold", CWallet::STAKE_SPLIT_THRESHOLD);
 
-    if(reset){
+    if (reset){
+        setStakeSplitThreshold(CWallet::STAKE_SPLIT_THRESHOLD);
         refreshDataView();
     }
 }
@@ -217,7 +215,7 @@ void OptionsModel::setDisplayDefaultOptions(QSettings& settings, bool reset){
     strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "").toString();
 
     if(reset){
-        emit dataChanged(index(0), index(rowCount(QModelIndex()) - 1));
+        refreshDataView();
     }
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -196,6 +196,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator>);
 
 public:
+
+    static const int STAKE_SPLIT_THRESHOLD = 2000;
+
     bool MintableCoins();
     bool SelectStakeCoins(std::list<std::unique_ptr<CStakeInput> >& listInputs, CAmount nTargetAmount, int blockHeight, bool fPrecompute = false);
     bool IsCollateralAmount(CAmount nInputAmount) const;
@@ -337,7 +340,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 
         // Stake Settings
         nHashDrift = 45;
-        nStakeSplitThreshold = 2000;
+        nStakeSplitThreshold = STAKE_SPLIT_THRESHOLD;
         nHashInterval = 22;
         nStakeSetUpdateTime = 300; // 5 minutes
 

Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,10 @@ void OptionsModel::setWalletDefaultOptions(QSettings& settings, bool reset){`
`136`	`136`	`addOverriddenOption("-spendzeroconfchange");`
`137`	`137`
`138`	`138`	`if (!settings.contains("nStakeSplitThreshold") \|\| reset)`
`139`		`- settings.setValue("nStakeSplitThreshold", 1);`
`140`		`- if (reset){`
`141`		`- setStakeSplitThreshold(1);`
`142`		`- }`
	`139`	`+ settings.setValue("nStakeSplitThreshold", CWallet::STAKE_SPLIT_THRESHOLD);`
`143`	`140`
`144`		`- if(reset){`
	`141`	`+ if (reset){`
	`142`	`+ setStakeSplitThreshold(CWallet::STAKE_SPLIT_THRESHOLD);`
`145`	`143`	`refreshDataView();`
`146`	`144`	`}`
`147`	`145`	`}`
`@@ -217,7 +215,7 @@ void OptionsModel::setDisplayDefaultOptions(QSettings& settings, bool reset){`
`217`	`215`	`strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "").toString();`
`218`	`216`
`219`	`217`	`if(reset){`
`220`		`- emit dataChanged(index(0), index(rowCount(QModelIndex()) - 1));`
	`218`	`+ refreshDataView();`
`221`	`219`	`}`
`222`	`220`	`}`
`223`	`221`