diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-07-16 16:24:42 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-07-16 16:22:14 -0400 |
| commit | fa4a605a4c611abe9af4c18aab20f4d1d039170f (patch) | |
| tree | fe1d28f8b0cd359805fb7252a5bf6838b1b88a5d /src/wallet | |
| parent | 24dbcf380844f326b6a4e59466dba892314d2843 (diff) | |
Remove wallet settings from chainparams
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 07fc8c35d5..5328ddafed 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4388,7 +4388,7 @@ std::shared_ptr<CWallet> CWallet::CreateWalletFromFile(interfaces::Chain& chain, walletInstance->m_min_fee = CFeeRate(n); } - walletInstance->m_allow_fallback_fee = Params().IsFallbackFeeEnabled(); + walletInstance->m_allow_fallback_fee = Params().IsTestChain(); if (gArgs.IsArgSet("-fallbackfee")) { CAmount nFeePerK = 0; if (!ParseMoney(gArgs.GetArg("-fallbackfee", ""), nFeePerK)) { diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 5f226cf5c0..3ba9a2ae78 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -12,7 +12,6 @@ #include <outputtype.h> #include <policy/feerate.h> #include <script/sign.h> -#include <streams.h> #include <tinyformat.h> #include <ui_interface.h> #include <util/strencodings.h> |