diff options
author | MarcoFalke <falke.marco@gmail.com> | 2019-03-19 16:37:39 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2019-03-19 16:30:07 -0400 |
commit | dddd6f0f5832844de8d6f9956dabbb8c8abe80b5 (patch) | |
tree | db230c2b5e035c72feccb369be2cc578847ba0db /src | |
parent | 81f732bcaa30edcc16a0d85e3d56e7a1d4845ae1 (diff) | |
download | bitcoin-dddd6f0f5832844de8d6f9956dabbb8c8abe80b5.tar.xz |
init: Throw error when network specific config is ignored
Diffstat (limited to 'src')
-rw-r--r-- | src/init.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/init.cpp b/src/init.cpp index 0898d0ff25..1960846376 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -828,19 +828,6 @@ void InitParameterInteraction() if (gArgs.SoftSetBoolArg("-whitelistrelay", true)) LogPrintf("%s: parameter interaction: -whitelistforcerelay=1 -> setting -whitelistrelay=1\n", __func__); } - - // Warn if network-specific options (-addnode, -connect, etc) are - // specified in default section of config file, but not overridden - // on the command line or in this network's section of the config file. - std::string network = gArgs.GetChainName(); - for (const auto& arg : gArgs.GetUnsuitableSectionOnlyArgs()) { - InitWarning(strprintf(_("Config setting for %s only applied on %s network when in [%s] section."), arg, network, network)); - } - - // Warn if unrecognized section name are present in the config file. - for (const auto& section : gArgs.GetUnrecognizedSections()) { - InitWarning(strprintf("%s:%i " + _("Section [%s] is not recognized."), section.m_file, section.m_line, section.m_name)); - } } static std::string ResolveErrMsg(const char * const optname, const std::string& strBind) @@ -950,6 +937,19 @@ bool AppInitParameterInteraction() // also see: InitParameterInteraction() + // Warn if network-specific options (-addnode, -connect, etc) are + // specified in default section of config file, but not overridden + // on the command line or in this network's section of the config file. + std::string network = gArgs.GetChainName(); + for (const auto& arg : gArgs.GetUnsuitableSectionOnlyArgs()) { + return InitError(strprintf(_("Config setting for %s only applied on %s network when in [%s] section."), arg, network, network)); + } + + // Warn if unrecognized section name are present in the config file. + for (const auto& section : gArgs.GetUnrecognizedSections()) { + InitWarning(strprintf("%s:%i " + _("Section [%s] is not recognized."), section.m_file, section.m_line, section.m_name)); + } + if (!fs::is_directory(GetBlocksDir())) { return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist."), gArgs.GetArg("-blocksdir", "").c_str())); } |