fuzz: Introduce CallOneOf helper to replace switch-case

Can be reviewed with --ignore-all-space

1 files changed, 98 insertions, 102 deletions

diff --git a/src/test/fuzz/connman.cpp b/src/test/fuzz/connman.cpp
index fdf51d8558..7950213bd5 100644
--- a/src/test/fuzz/connman.cpp
+++ b/src/test/fuzz/connman.cpp
@@ -32,108 +32,104 @@ FUZZ_TARGET_INIT(connman, initialize_connman)
     CSubNet random_subnet;
     std::string random_string;
     while (fuzzed_data_provider.ConsumeBool()) {
-        switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 27)) {
-        case 0:
-            random_address = ConsumeAddress(fuzzed_data_provider);
-            break;
-        case 1:
-            random_netaddr = ConsumeNetAddr(fuzzed_data_provider);
-            break;
-        case 2:
-            random_service = ConsumeService(fuzzed_data_provider);
-            break;
-        case 3:
-            random_subnet = ConsumeSubNet(fuzzed_data_provider);
-            break;
-        case 4:
-            random_string = fuzzed_data_provider.ConsumeRandomLengthString(64);
-            break;
-        case 5: {
-            std::vector<CAddress> addresses;
-            while (fuzzed_data_provider.ConsumeBool()) {
-                addresses.push_back(ConsumeAddress(fuzzed_data_provider));
-            }
-            // Limit nTimePenalty to int32_t to avoid signed integer overflow
-            (void)connman.AddNewAddresses(addresses, ConsumeAddress(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<int32_t>());
-            break;
-        }
-        case 6:
-            connman.AddNode(random_string);
-            break;
-        case 7:
-            connman.CheckIncomingNonce(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
-            break;
-        case 8:
-            connman.DisconnectNode(fuzzed_data_provider.ConsumeIntegral<NodeId>());
-            break;
-        case 9:
-            connman.DisconnectNode(random_netaddr);
-            break;
-        case 10:
-            connman.DisconnectNode(random_string);
-            break;
-        case 11:
-            connman.DisconnectNode(random_subnet);
-            break;
-        case 12:
-            connman.ForEachNode([](auto) {});
-            break;
-        case 13:
-            connman.ForEachNodeThen([](auto) {}, []() {});
-            break;
-        case 14:
-            (void)connman.ForNode(fuzzed_data_provider.ConsumeIntegral<NodeId>(), [&](auto) { return fuzzed_data_provider.ConsumeBool(); });
-            break;
-        case 15:
-            (void)connman.GetAddresses(fuzzed_data_provider.ConsumeIntegral<size_t>(), fuzzed_data_provider.ConsumeIntegral<size_t>());
-            break;
-        case 16: {
-            (void)connman.GetAddresses(random_node, fuzzed_data_provider.ConsumeIntegral<size_t>(), fuzzed_data_provider.ConsumeIntegral<size_t>());
-            break;
-        }
-        case 17:
-            (void)connman.GetDeterministicRandomizer(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
-            break;
-        case 18:
-            (void)connman.GetNodeCount(fuzzed_data_provider.PickValueInArray({CConnman::CONNECTIONS_NONE, CConnman::CONNECTIONS_IN, CConnman::CONNECTIONS_OUT, CConnman::CONNECTIONS_ALL}));
-            break;
-        case 19:
-            connman.MarkAddressGood(random_address);
-            break;
-        case 20:
-            (void)connman.OutboundTargetReached(fuzzed_data_provider.ConsumeBool());
-            break;
-        case 21:
-            // Limit now to int32_t to avoid signed integer overflow
-            (void)connman.PoissonNextSendInbound(fuzzed_data_provider.ConsumeIntegral<int32_t>(), fuzzed_data_provider.ConsumeIntegral<int>());
-            break;
-        case 22: {
-            CSerializedNetMsg serialized_net_msg;
-            serialized_net_msg.m_type = fuzzed_data_provider.ConsumeRandomLengthString(CMessageHeader::COMMAND_SIZE);
-            serialized_net_msg.data = ConsumeRandomLengthByteVector(fuzzed_data_provider);
-            connman.PushMessage(&random_node, std::move(serialized_net_msg));
-            break;
-        }
-        case 23:
-            connman.RemoveAddedNode(random_string);
-            break;
-        case 24: {
-            const std::vector<bool> asmap = ConsumeRandomLengthBitVector(fuzzed_data_provider);
-            if (SanityCheckASMap(asmap)) {
-                connman.SetAsmap(asmap);
-            }
-            break;
-        }
-        case 25:
-            connman.SetNetworkActive(fuzzed_data_provider.ConsumeBool());
-            break;
-        case 26:
-            connman.SetServices(random_service, ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS));
-            break;
-        case 27:
-            connman.SetTryNewOutboundPeer(fuzzed_data_provider.ConsumeBool());
-            break;
-        }
+        CallOneOf(
+            fuzzed_data_provider,
+            [&] {
+                random_address = ConsumeAddress(fuzzed_data_provider);
+            },
+            [&] {
+                random_netaddr = ConsumeNetAddr(fuzzed_data_provider);
+            },
+            [&] {
+                random_service = ConsumeService(fuzzed_data_provider);
+            },
+            [&] {
+                random_subnet = ConsumeSubNet(fuzzed_data_provider);
+            },
+            [&] {
+                random_string = fuzzed_data_provider.ConsumeRandomLengthString(64);
+            },
+            [&] {
+                std::vector<CAddress> addresses;
+                while (fuzzed_data_provider.ConsumeBool()) {
+                    addresses.push_back(ConsumeAddress(fuzzed_data_provider));
+                }
+                // Limit nTimePenalty to int32_t to avoid signed integer overflow
+                (void)connman.AddNewAddresses(addresses, ConsumeAddress(fuzzed_data_provider), fuzzed_data_provider.ConsumeIntegral<int32_t>());
+            },
+            [&] {
+                connman.AddNode(random_string);
+            },
+            [&] {
+                connman.CheckIncomingNonce(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
+            },
+            [&] {
+                connman.DisconnectNode(fuzzed_data_provider.ConsumeIntegral<NodeId>());
+            },
+            [&] {
+                connman.DisconnectNode(random_netaddr);
+            },
+            [&] {
+                connman.DisconnectNode(random_string);
+            },
+            [&] {
+                connman.DisconnectNode(random_subnet);
+            },
+            [&] {
+                connman.ForEachNode([](auto) {});
+            },
+            [&] {
+                connman.ForEachNodeThen([](auto) {}, []() {});
+            },
+            [&] {
+                (void)connman.ForNode(fuzzed_data_provider.ConsumeIntegral<NodeId>(), [&](auto) { return fuzzed_data_provider.ConsumeBool(); });
+            },
+            [&] {
+                (void)connman.GetAddresses(fuzzed_data_provider.ConsumeIntegral<size_t>(), fuzzed_data_provider.ConsumeIntegral<size_t>());
+            },
+            [&] {
+                (void)connman.GetAddresses(random_node, fuzzed_data_provider.ConsumeIntegral<size_t>(), fuzzed_data_provider.ConsumeIntegral<size_t>());
+            },
+            [&] {
+                (void)connman.GetDeterministicRandomizer(fuzzed_data_provider.ConsumeIntegral<uint64_t>());
+            },
+            [&] {
+                (void)connman.GetNodeCount(fuzzed_data_provider.PickValueInArray({CConnman::CONNECTIONS_NONE, CConnman::CONNECTIONS_IN, CConnman::CONNECTIONS_OUT, CConnman::CONNECTIONS_ALL}));
+            },
+            [&] {
+                connman.MarkAddressGood(random_address);
+            },
+            [&] {
+                (void)connman.OutboundTargetReached(fuzzed_data_provider.ConsumeBool());
+            },
+            [&] {
+                // Limit now to int32_t to avoid signed integer overflow
+                (void)connman.PoissonNextSendInbound(fuzzed_data_provider.ConsumeIntegral<int32_t>(), fuzzed_data_provider.ConsumeIntegral<int>());
+            },
+            [&] {
+                CSerializedNetMsg serialized_net_msg;
+                serialized_net_msg.m_type = fuzzed_data_provider.ConsumeRandomLengthString(CMessageHeader::COMMAND_SIZE);
+                serialized_net_msg.data = ConsumeRandomLengthByteVector(fuzzed_data_provider);
+                connman.PushMessage(&random_node, std::move(serialized_net_msg));
+            },
+            [&] {
+                connman.RemoveAddedNode(random_string);
+            },
+            [&] {
+                const std::vector<bool> asmap = ConsumeRandomLengthBitVector(fuzzed_data_provider);
+                if (SanityCheckASMap(asmap)) {
+                    connman.SetAsmap(asmap);
+                }
+            },
+            [&] {
+                connman.SetNetworkActive(fuzzed_data_provider.ConsumeBool());
+            },
+            [&] {
+                connman.SetServices(random_service, ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS));
+            },
+            [&] {
+                connman.SetTryNewOutboundPeer(fuzzed_data_provider.ConsumeBool());
+            });
     }
     (void)connman.GetAddedNodeInfo();
     (void)connman.GetExtraFullOutboundCount();