fuzz: Introduce CallOneOf helper to replace switch-case

Can be reviewed with --ignore-all-space

1 files changed, 55 insertions, 63 deletions

diff --git a/src/test/fuzz/system.cpp b/src/test/fuzz/system.cpp
index 375a8c1ed0..47b38b6d23 100644
--- a/src/test/fuzz/system.cpp
+++ b/src/test/fuzz/system.cpp
@@ -32,71 +32,63 @@ FUZZ_TARGET(system)
     }
 
     while (fuzzed_data_provider.ConsumeBool()) {
-        switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 7)) {
-        case 0: {
-            args_manager.SelectConfigNetwork(fuzzed_data_provider.ConsumeRandomLengthString(16));
-            break;
-        }
-        case 1: {
-            args_manager.SoftSetArg(fuzzed_data_provider.ConsumeRandomLengthString(16), fuzzed_data_provider.ConsumeRandomLengthString(16));
-            break;
-        }
-        case 2: {
-            args_manager.ForceSetArg(fuzzed_data_provider.ConsumeRandomLengthString(16), fuzzed_data_provider.ConsumeRandomLengthString(16));
-            break;
-        }
-        case 3: {
-            args_manager.SoftSetBoolArg(fuzzed_data_provider.ConsumeRandomLengthString(16), fuzzed_data_provider.ConsumeBool());
-            break;
-        }
-        case 4: {
-            const OptionsCategory options_category = fuzzed_data_provider.PickValueInArray<OptionsCategory>({OptionsCategory::OPTIONS, OptionsCategory::CONNECTION, OptionsCategory::WALLET, OptionsCategory::WALLET_DEBUG_TEST, OptionsCategory::ZMQ, OptionsCategory::DEBUG_TEST, OptionsCategory::CHAINPARAMS, OptionsCategory::NODE_RELAY, OptionsCategory::BLOCK_CREATION, OptionsCategory::RPC, OptionsCategory::GUI, OptionsCategory::COMMANDS, OptionsCategory::REGISTER_COMMANDS, OptionsCategory::HIDDEN});
-            // Avoid hitting:
-            // util/system.cpp:425: void ArgsManager::AddArg(const std::string &, const std::string &, unsigned int, const OptionsCategory &): Assertion `ret.second' failed.
-            const std::string argument_name = GetArgumentName(fuzzed_data_provider.ConsumeRandomLengthString(16));
-            if (args_manager.GetArgFlags(argument_name) != nullopt) {
-                break;
-            }
-            args_manager.AddArg(argument_name, fuzzed_data_provider.ConsumeRandomLengthString(16), fuzzed_data_provider.ConsumeIntegral<unsigned int>(), options_category);
-            break;
-        }
-        case 5: {
-            // Avoid hitting:
-            // util/system.cpp:425: void ArgsManager::AddArg(const std::string &, const std::string &, unsigned int, const OptionsCategory &): Assertion `ret.second' failed.
-            const std::vector<std::string> names = ConsumeRandomLengthStringVector(fuzzed_data_provider);
-            std::vector<std::string> hidden_arguments;
-            for (const std::string& name : names) {
-                const std::string hidden_argument = GetArgumentName(name);
-                if (args_manager.GetArgFlags(hidden_argument) != nullopt) {
-                    continue;
+        CallOneOf(
+            fuzzed_data_provider,
+            [&] {
+                args_manager.SelectConfigNetwork(fuzzed_data_provider.ConsumeRandomLengthString(16));
+            },
+            [&] {
+                args_manager.SoftSetArg(fuzzed_data_provider.ConsumeRandomLengthString(16), fuzzed_data_provider.ConsumeRandomLengthString(16));
+            },
+            [&] {
+                args_manager.ForceSetArg(fuzzed_data_provider.ConsumeRandomLengthString(16), fuzzed_data_provider.ConsumeRandomLengthString(16));
+            },
+            [&] {
+                args_manager.SoftSetBoolArg(fuzzed_data_provider.ConsumeRandomLengthString(16), fuzzed_data_provider.ConsumeBool());
+            },
+            [&] {
+                const OptionsCategory options_category = fuzzed_data_provider.PickValueInArray<OptionsCategory>({OptionsCategory::OPTIONS, OptionsCategory::CONNECTION, OptionsCategory::WALLET, OptionsCategory::WALLET_DEBUG_TEST, OptionsCategory::ZMQ, OptionsCategory::DEBUG_TEST, OptionsCategory::CHAINPARAMS, OptionsCategory::NODE_RELAY, OptionsCategory::BLOCK_CREATION, OptionsCategory::RPC, OptionsCategory::GUI, OptionsCategory::COMMANDS, OptionsCategory::REGISTER_COMMANDS, OptionsCategory::HIDDEN});
+                // Avoid hitting:
+                // util/system.cpp:425: void ArgsManager::AddArg(const std::string &, const std::string &, unsigned int, const OptionsCategory &): Assertion `ret.second' failed.
+                const std::string argument_name = GetArgumentName(fuzzed_data_provider.ConsumeRandomLengthString(16));
+                if (args_manager.GetArgFlags(argument_name) != nullopt) {
+                    return;
                 }
-                if (std::find(hidden_arguments.begin(), hidden_arguments.end(), hidden_argument) != hidden_arguments.end()) {
-                    continue;
+                args_manager.AddArg(argument_name, fuzzed_data_provider.ConsumeRandomLengthString(16), fuzzed_data_provider.ConsumeIntegral<unsigned int>(), options_category);
+            },
+            [&] {
+                // Avoid hitting:
+                // util/system.cpp:425: void ArgsManager::AddArg(const std::string &, const std::string &, unsigned int, const OptionsCategory &): Assertion `ret.second' failed.
+                const std::vector<std::string> names = ConsumeRandomLengthStringVector(fuzzed_data_provider);
+                std::vector<std::string> hidden_arguments;
+                for (const std::string& name : names) {
+                    const std::string hidden_argument = GetArgumentName(name);
+                    if (args_manager.GetArgFlags(hidden_argument) != nullopt) {
+                        continue;
+                    }
+                    if (std::find(hidden_arguments.begin(), hidden_arguments.end(), hidden_argument) != hidden_arguments.end()) {
+                        continue;
+                    }
+                    hidden_arguments.push_back(hidden_argument);
                 }
-                hidden_arguments.push_back(hidden_argument);
-            }
-            args_manager.AddHiddenArgs(hidden_arguments);
-            break;
-        }
-        case 6: {
-            args_manager.ClearArgs();
-            break;
-        }
-        case 7: {
-            const std::vector<std::string> random_arguments = ConsumeRandomLengthStringVector(fuzzed_data_provider);
-            std::vector<const char*> argv;
-            argv.reserve(random_arguments.size());
-            for (const std::string& random_argument : random_arguments) {
-                argv.push_back(random_argument.c_str());
-            }
-            try {
-                std::string error;
-                (void)args_manager.ParseParameters(argv.size(), argv.data(), error);
-            } catch (const std::logic_error&) {
-            }
-            break;
-        }
-        }
+                args_manager.AddHiddenArgs(hidden_arguments);
+            },
+            [&] {
+                args_manager.ClearArgs();
+            },
+            [&] {
+                const std::vector<std::string> random_arguments = ConsumeRandomLengthStringVector(fuzzed_data_provider);
+                std::vector<const char*> argv;
+                argv.reserve(random_arguments.size());
+                for (const std::string& random_argument : random_arguments) {
+                    argv.push_back(random_argument.c_str());
+                }
+                try {
+                    std::string error;
+                    (void)args_manager.ParseParameters(argv.size(), argv.data(), error);
+                } catch (const std::logic_error&) {
+                }
+            });
     }
 
     const std::string s1 = fuzzed_data_provider.ConsumeRandomLengthString(16);