[Refactor] move nReserveBalance from main to wallet

random-zebra · random-zebra · commit 38011f61c9c3 · 2020-03-02T14:41:30.000+01:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -918,12 +918,14 @@ bool AppInit2()
             LogPrintf("AppInit2 : parameter interaction: -enableswifttx=false -> setting -nSwiftTXDepth=0\n");
     }
 
+#ifdef ENABLE_WALLET
     if (mapArgs.count("-reservebalance")) {
         if (!ParseMoney(mapArgs["-reservebalance"], nReserveBalance)) {
             InitError(_("Invalid amount for -reservebalance=<amount>"));
             return false;
         }
     }
+#endif
 
     // Make sure enough file descriptors are available
     int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1);
diff --git a/src/main.cpp b/src/main.cpp
@@ -89,8 +89,6 @@ bool fAlerts = DEFAULT_ALERTS;
 /* If the tip is older than this (in seconds), the node is considered to be in initial block download. */
 int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
 
-int64_t nReserveBalance = 0;
-
 /** Fees smaller than this (in upiv) are considered zero fee (for relaying and mining)
  * We are ~100 times smaller then bitcoin now (2015-06-23), set minRelayTxFee only 10 times higher
  * so it's still 10 times lower comparing to bitcoin.
diff --git a/src/main.h b/src/main.h
@@ -150,8 +150,6 @@ extern bool fVerifyingBlocks;
 extern bool fLargeWorkForkFound;
 extern bool fLargeWorkInvalidChainFound;
 
-extern int64_t nReserveBalance;
-
 extern std::map<uint256, int64_t> mapRejectedBlocks;
 
 /** Best header we've seen so far (used for getheaders queries' starting points). */
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -30,6 +30,7 @@ bool bSpendZeroConfChange = true;
 bool bdisableSystemnotifications = false; // Those bubbles can be annoying and slow down the UI when you get lots of trx
 bool fSendFreeTransactions = false;
 bool fPayAtLeastCustomFee = true;
+int64_t nReserveBalance = 0;
 
 /**
  * Fees smaller than this (in upiv) are considered zero fee (for transaction creation)
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -49,6 +49,7 @@ extern bool bSpendZeroConfChange;
 extern bool bdisableSystemnotifications;
 extern bool fSendFreeTransactions;
 extern bool fPayAtLeastCustomFee;
+extern int64_t nReserveBalance;
 
 //! -paytxfee default
 static const CAmount DEFAULT_TRANSACTION_FEE = 0;

Original file line number	Diff line number	Diff line change
`@@ -918,12 +918,14 @@ bool AppInit2()`
`918`	`918`	`LogPrintf("AppInit2 : parameter interaction: -enableswifttx=false -> setting -nSwiftTXDepth=0\n");`
`919`	`919`	`}`
`920`	`920`
	`921`	`+#ifdef ENABLE_WALLET`
`921`	`922`	`if (mapArgs.count("-reservebalance")) {`
`922`	`923`	`if (!ParseMoney(mapArgs["-reservebalance"], nReserveBalance)) {`
`923`	`924`	`InitError(_("Invalid amount for -reservebalance=<amount>"));`
`924`	`925`	`return false;`
`925`	`926`	`}`
`926`	`927`	`}`
	`928`	`+#endif`
`927`	`929`
`928`	`930`	`// Make sure enough file descriptors are available`
`929`	`931`	`int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1);`