From cd7fa8bb437267db2502415e4fb035d60bda860c Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 13 Dec 2013 16:14:48 +0100 Subject: Move `nTransactionFee` from main.cpp to wallet.cpp Transaction fee is only used by the wallet. No need for it to be in main.cpp. --- src/rpcmisc.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/rpcmisc.cpp') diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 6cccc93c72..0a22b103c3 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -78,9 +78,7 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime())); obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); } -#endif obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); -#ifdef ENABLE_WALLET if (pwalletMain && pwalletMain->IsCrypted()) obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); #endif -- cgit v1.2.3