diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-13 16:14:48 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-13 16:34:57 +0100 |
| commit | cd7fa8bb437267db2502415e4fb035d60bda860c (patch) | |
| tree | ebb78a41255c9c75f84b19eb59a985444848c093 /src/init.cpp | |
| parent | a943bde6f067567e47c6e12b16c541bb1fea575a (diff) | |
| download | bitcoin-cd7fa8bb437267db2502415e4fb035d60bda860c.tar.xz | |
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/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 40dd2d04cd..7b14ccbf13 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -534,6 +534,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) return InitError(strprintf(_("Invalid amount for -minrelaytxfee=<amount>: '%s'"), mapArgs["-minrelaytxfee"].c_str())); } +#ifdef ENABLE_WALLET if (mapArgs.count("-paytxfee")) { if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee)) @@ -542,7 +543,6 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer) InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.")); } -#ifdef ENABLE_WALLET strWalletFile = GetArg("-wallet", "wallet.dat"); #endif // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log |