Skip to content

Commit cba2710

Browse files
ryanofskyryanofsky
committed
scripted-diff: Remove unused ArgsManager type flags in tests
The bool/int/string flags were added speculatively in bitcoin#16097 and trigger errors when type checking is actually implemented in bitcoin#16545 -BEGIN VERIFY SCRIPT- sed -i 's/ALLOW_\(BOOL\|INT\|STRING\)/ALLOW_ANY/g' src/test/util_tests.cpp src/test/getarg_tests.cpp -END VERIFY SCRIPT- This commit does not change behavior.
1 parent 425bb30 commit cba2710

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎src/test/getarg_tests.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void SetupArgs(const std::vector<std::pair<std::string, unsigned int>>& a
4343

4444
BOOST_AUTO_TEST_CASE(boolarg)
4545
{
46-
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_BOOL);
46+
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_ANY);
4747
SetupArgs({foo});
4848
ResetArgs("-foo");
4949
BOOST_CHECK(gArgs.GetBoolArg("-foo", false));
@@ -97,8 +97,8 @@ BOOST_AUTO_TEST_CASE(boolarg)
9797

9898
BOOST_AUTO_TEST_CASE(stringarg)
9999
{
100-
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_STRING);
101-
const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_STRING);
100+
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_ANY);
101+
const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_ANY);
102102
SetupArgs({foo, bar});
103103
ResetArgs("");
104104
BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", ""), "");
@@ -124,8 +124,8 @@ BOOST_AUTO_TEST_CASE(stringarg)
124124

125125
BOOST_AUTO_TEST_CASE(intarg)
126126
{
127-
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_INT);
128-
const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_INT);
127+
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_ANY);
128+
const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_ANY);
129129
SetupArgs({foo, bar});
130130
ResetArgs("");
131131
BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", 11), 11);
@@ -159,8 +159,8 @@ BOOST_AUTO_TEST_CASE(doubledash)
159159

160160
BOOST_AUTO_TEST_CASE(boolargno)
161161
{
162-
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_BOOL);
163-
const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_BOOL);
162+
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_ANY);
163+
const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_ANY);
164164
SetupArgs({foo, bar});
165165
ResetArgs("-nofoo");
166166
BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));

‎src/test/util_tests.cpp

+19-19
Original file line numberDiff line numberDiff line change
@@ -397,12 +397,12 @@ BOOST_AUTO_TEST_CASE(util_ArgParsing)
397397
BOOST_AUTO_TEST_CASE(util_GetBoolArg)
398398
{
399399
TestArgsManager testArgs;
400-
const auto a = std::make_pair("-a", ArgsManager::ALLOW_BOOL);
401-
const auto b = std::make_pair("-b", ArgsManager::ALLOW_BOOL);
402-
const auto c = std::make_pair("-c", ArgsManager::ALLOW_BOOL);
403-
const auto d = std::make_pair("-d", ArgsManager::ALLOW_BOOL);
404-
const auto e = std::make_pair("-e", ArgsManager::ALLOW_BOOL);
405-
const auto f = std::make_pair("-f", ArgsManager::ALLOW_BOOL);
400+
const auto a = std::make_pair("-a", ArgsManager::ALLOW_ANY);
401+
const auto b = std::make_pair("-b", ArgsManager::ALLOW_ANY);
402+
const auto c = std::make_pair("-c", ArgsManager::ALLOW_ANY);
403+
const auto d = std::make_pair("-d", ArgsManager::ALLOW_ANY);
404+
const auto e = std::make_pair("-e", ArgsManager::ALLOW_ANY);
405+
const auto f = std::make_pair("-f", ArgsManager::ALLOW_ANY);
406406

407407
const char *argv_test[] = {
408408
"ignored", "-a", "-nob", "-c=0", "-d=1", "-e=false", "-f=true"};
@@ -441,8 +441,8 @@ BOOST_AUTO_TEST_CASE(util_GetBoolArgEdgeCases)
441441
TestArgsManager testArgs;
442442

443443
// Params test
444-
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_BOOL);
445-
const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_BOOL);
444+
const auto foo = std::make_pair("-foo", ArgsManager::ALLOW_ANY);
445+
const auto bar = std::make_pair("-bar", ArgsManager::ALLOW_ANY);
446446
const char *argv_test[] = {"ignored", "-nofoo", "-foo", "-nobar=0"};
447447
testArgs.SetupArgs({foo, bar});
448448
std::string error;
@@ -514,16 +514,16 @@ BOOST_AUTO_TEST_CASE(util_ReadConfigStream)
514514

515515
TestArgsManager test_args;
516516
LOCK(test_args.cs_args);
517-
const auto a = std::make_pair("-a", ArgsManager::ALLOW_BOOL);
518-
const auto b = std::make_pair("-b", ArgsManager::ALLOW_BOOL);
519-
const auto ccc = std::make_pair("-ccc", ArgsManager::ALLOW_STRING);
520-
const auto d = std::make_pair("-d", ArgsManager::ALLOW_STRING);
517+
const auto a = std::make_pair("-a", ArgsManager::ALLOW_ANY);
518+
const auto b = std::make_pair("-b", ArgsManager::ALLOW_ANY);
519+
const auto ccc = std::make_pair("-ccc", ArgsManager::ALLOW_ANY);
520+
const auto d = std::make_pair("-d", ArgsManager::ALLOW_ANY);
521521
const auto e = std::make_pair("-e", ArgsManager::ALLOW_ANY);
522-
const auto fff = std::make_pair("-fff", ArgsManager::ALLOW_BOOL);
523-
const auto ggg = std::make_pair("-ggg", ArgsManager::ALLOW_BOOL);
524-
const auto h = std::make_pair("-h", ArgsManager::ALLOW_BOOL);
525-
const auto i = std::make_pair("-i", ArgsManager::ALLOW_BOOL);
526-
const auto iii = std::make_pair("-iii", ArgsManager::ALLOW_INT);
522+
const auto fff = std::make_pair("-fff", ArgsManager::ALLOW_ANY);
523+
const auto ggg = std::make_pair("-ggg", ArgsManager::ALLOW_ANY);
524+
const auto h = std::make_pair("-h", ArgsManager::ALLOW_ANY);
525+
const auto i = std::make_pair("-i", ArgsManager::ALLOW_ANY);
526+
const auto iii = std::make_pair("-iii", ArgsManager::ALLOW_ANY);
527527
test_args.SetupArgs({a, b, ccc, d, e, fff, ggg, h, i, iii});
528528

529529
test_args.ReadConfigString(str_config);
@@ -726,8 +726,8 @@ BOOST_AUTO_TEST_CASE(util_GetArg)
726726
BOOST_AUTO_TEST_CASE(util_GetChainName)
727727
{
728728
TestArgsManager test_args;
729-
const auto testnet = std::make_pair("-testnet", ArgsManager::ALLOW_BOOL);
730-
const auto regtest = std::make_pair("-regtest", ArgsManager::ALLOW_BOOL);
729+
const auto testnet = std::make_pair("-testnet", ArgsManager::ALLOW_ANY);
730+
const auto regtest = std::make_pair("-regtest", ArgsManager::ALLOW_ANY);
731731
test_args.SetupArgs({testnet, regtest});
732732

733733
const char* argv_testnet[] = {"cmd", "-testnet"};

0 commit comments

Comments
 (0)