mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-13 11:35:20 +01:00
Code Issues Projects Releases Wiki Activity

refactor: Remove settings merge reverse precedence code

Browse source 
This commit has no effect on behavior because as of
https://github.com/bitcoin/bitcoin/pull/17493 it's not possible to specify
multiple values for single value settings in the config file.
This commit is contained in:
Ryan Ofsky 2019-11-15 16:44:19 -05:00
parent 9f44333f10
commit 77131ff802
3 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/settings.cpp
View file

@ -159,15 +159,6 @@ SettingsValue GetSetting(const Settings& settings,
// even though normal non-negated values there would be ignored. // even though normal non-negated values there would be ignored.
const bool never_ignore_negated_setting = span.last_negated(); const bool never_ignore_negated_setting = span.last_negated();
// Weird behavior preserved for backwards compatibility: Take first
// assigned value instead of last. In general, later settings take
// precedence over early settings, but for backwards compatibility in
// the config file the precedence is reversed for all settings except
// chain type settings.
const bool reverse_precedence =
(source == Source::CONFIG_FILE_NETWORK_SECTION || source == Source::CONFIG_FILE_DEFAULT_SECTION) &&
!get_chain_type;
// Weird behavior preserved for backwards compatibility: Negated // Weird behavior preserved for backwards compatibility: Negated
// -regtest and -testnet arguments which you would expect to override // -regtest and -testnet arguments which you would expect to override
// values set in the configuration file are currently accepted but // values set in the configuration file are currently accepted but
@ -190,7 +181,7 @@ SettingsValue GetSetting(const Settings& settings,
if (skip_negated_command_line && span.last_negated()) return; if (skip_negated_command_line && span.last_negated()) return;
if (!span.empty()) { if (!span.empty()) {
result = reverse_precedence ? span.begin()[0] : span.end()[-1]; result = span.end()[-1];
done = true; done = true;
} else if (span.last_negated()) { } else if (span.last_negated()) {
result = false; result = false;

6
src/test/argsman_tests.cpp
View file

@ -1067,7 +1067,7 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
BOOST_CHECK_EQUAL(test_args.GetArg("-a", "xxx"), ""); BOOST_CHECK_EQUAL(test_args.GetArg("-a", "xxx"), "");
BOOST_CHECK_EQUAL(test_args.GetArg("-b", "xxx"), "1"); BOOST_CHECK_EQUAL(test_args.GetArg("-b", "xxx"), "1");
BOOST_CHECK_EQUAL(test_args.TestArgString("-ccc", "xxx"), "argument"); BOOST_CHECK_EQUAL(test_args.TestArgString("-ccc", "xxx"), "multiple");
BOOST_CHECK_EQUAL(test_args.GetArg("-d", "xxx"), "e"); BOOST_CHECK_EQUAL(test_args.GetArg("-d", "xxx"), "e");
BOOST_CHECK_EQUAL(test_args.GetArg("-fff", "xxx"), "0"); BOOST_CHECK_EQUAL(test_args.GetArg("-fff", "xxx"), "0");
BOOST_CHECK_EQUAL(test_args.GetArg("-ggg", "xxx"), "1"); BOOST_CHECK_EQUAL(test_args.GetArg("-ggg", "xxx"), "1");
@ -1133,7 +1133,7 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
// section-specific setting // section-specific setting
BOOST_CHECK(test_args.TestArgString("-h", "xxx") == "1"); BOOST_CHECK(test_args.TestArgString("-h", "xxx") == "1");
// section takes priority for multiple values // section takes priority for multiple values
BOOST_CHECK(test_args.TestArgString("-ccc", "xxx") == "extend1"); BOOST_CHECK(test_args.TestArgString("-ccc", "xxx") == "extend2");
// check multiple values works // check multiple values works
const std::vector<std::string> sec1_ccc_expected = {"extend1","extend2","argument","multiple"}; const std::vector<std::string> sec1_ccc_expected = {"extend1","extend2","argument","multiple"};
const auto& sec1_ccc_res = test_args.GetArgs("-ccc"); const auto& sec1_ccc_res = test_args.GetArgs("-ccc");
@ -1216,7 +1216,7 @@ BOOST_AUTO_TEST_CASE(util_GetArg)
BOOST_CHECK_EQUAL(testArgs.GetBoolArg("booltest4", false), true); BOOST_CHECK_EQUAL(testArgs.GetBoolArg("booltest4", false), true);
BOOST_CHECK_EQUAL(testArgs.GetArg("pritest1", "default"), "b"); BOOST_CHECK_EQUAL(testArgs.GetArg("pritest1", "default"), "b");
BOOST_CHECK_EQUAL(testArgs.GetArg("pritest2", "default"), "a"); BOOST_CHECK_EQUAL(testArgs.GetArg("pritest2", "default"), "b");
BOOST_CHECK_EQUAL(testArgs.GetArg("pritest3", "default"), "a"); BOOST_CHECK_EQUAL(testArgs.GetArg("pritest3", "default"), "a");
BOOST_CHECK_EQUAL(testArgs.GetArg("pritest4", "default"), "b"); BOOST_CHECK_EQUAL(testArgs.GetArg("pritest4", "default"), "b");
} }

11
src/test/settings_tests.cpp
View file

@ -127,15 +127,8 @@ BOOST_AUTO_TEST_CASE(Simple)
settings.command_line_options["name"].emplace_back("val2"); settings.command_line_options["name"].emplace_back("val2");
settings.ro_config["section"]["name"].emplace_back(2); settings.ro_config["section"]["name"].emplace_back(2);
// The last given arg takes precedence when specified via commandline. // The last given arg takes precedence when multiple values are present
CheckValues(settings, R"("val2")", R"(["val1","val2",2])"); CheckValues(settings, R"("val2")", R"(["val1","val2",2])");
common::Settings settings2;
settings2.ro_config["section"]["name"].emplace_back("val2");
settings2.ro_config["section"]["name"].emplace_back("val3");
// The first given arg takes precedence when specified via config file.
CheckValues(settings2, R"("val2")", R"(["val2","val3"])");
} }
// Confirm that a high priority setting overrides a lower priority setting even // Confirm that a high priority setting overrides a lower priority setting even
@ -263,7 +256,7 @@ BOOST_FIXTURE_TEST_CASE(Merge, MergeTestingSetup)
// Results file is formatted like: // Results file is formatted like:
// //
// <input> || GetSetting() | GetSettingsList() | OnlyHasDefaultSectionSetting() // <input> || GetSetting() | GetSettingsList() | OnlyHasDefaultSectionSetting()
BOOST_CHECK_EQUAL(out_sha_hex, "79db02d74e3e193196541b67c068b40ebd0c124a24b3ecbe9cbf7e85b1c4ba7a"); BOOST_CHECK_EQUAL(out_sha_hex, "10a2293bfd447ee128f80714bac5e8abe83df2a518980e383a8d590319d32a00");
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()