aboutsummaryrefslogtreecommitdiff
path: root/src/rpcmisc.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-12-13 16:14:48 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-12-13 16:34:57 +0100
commitcd7fa8bb437267db2502415e4fb035d60bda860c (patch)
treeebb78a41255c9c75f84b19eb59a985444848c093 /src/rpcmisc.cpp
parenta943bde6f067567e47c6e12b16c541bb1fea575a (diff)
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.
Diffstat (limited to 'src/rpcmisc.cpp')
-rw-r--r--src/rpcmisc.cpp2
1 files changed, 0 insertions, 2 deletions
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