fuzz: Introduce CallOneOf helper to replace switch-case

Can be reviewed with --ignore-all-space

1 files changed, 85 insertions, 99 deletions

diff --git a/src/test/fuzz/crypto.cpp b/src/test/fuzz/crypto.cpp
index 9668b84e7b..c2bb3a1a4e 100644
--- a/src/test/fuzz/crypto.cpp
+++ b/src/test/fuzz/crypto.cpp
@@ -39,109 +39,95 @@ FUZZ_TARGET(crypto)
     MuHash3072 muhash;
 
     while (fuzzed_data_provider.ConsumeBool()) {
-        switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 2)) {
-        case 0: {
-            if (fuzzed_data_provider.ConsumeBool()) {
-                data = ConsumeRandomLengthByteVector(fuzzed_data_provider);
-                if (data.empty()) {
-                    data.resize(fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, 4096), fuzzed_data_provider.ConsumeIntegral<uint8_t>());
+        CallOneOf(
+            fuzzed_data_provider,
+            [&] {
+                if (fuzzed_data_provider.ConsumeBool()) {
+                    data = ConsumeRandomLengthByteVector(fuzzed_data_provider);
+                    if (data.empty()) {
+                        data.resize(fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, 4096), fuzzed_data_provider.ConsumeIntegral<uint8_t>());
+                    }
                 }
-            }
 
-            (void)hash160.Write(data);
-            (void)hash256.Write(data);
-            (void)hmac_sha256.Write(data.data(), data.size());
-            (void)hmac_sha512.Write(data.data(), data.size());
-            (void)ripemd160.Write(data.data(), data.size());
-            (void)sha1.Write(data.data(), data.size());
-            (void)sha256.Write(data.data(), data.size());
-            (void)sha3.Write(data);
-            (void)sha512.Write(data.data(), data.size());
-            (void)sip_hasher.Write(data.data(), data.size());
+                (void)hash160.Write(data);
+                (void)hash256.Write(data);
+                (void)hmac_sha256.Write(data.data(), data.size());
+                (void)hmac_sha512.Write(data.data(), data.size());
+                (void)ripemd160.Write(data.data(), data.size());
+                (void)sha1.Write(data.data(), data.size());
+                (void)sha256.Write(data.data(), data.size());
+                (void)sha3.Write(data);
+                (void)sha512.Write(data.data(), data.size());
+                (void)sip_hasher.Write(data.data(), data.size());
 
-            (void)Hash(data);
-            (void)Hash160(data);
-            (void)sha512.Size();
+                (void)Hash(data);
+                (void)Hash160(data);
+                (void)sha512.Size();
 
-            if (fuzzed_data_provider.ConsumeBool()) {
-                muhash *= MuHash3072(data);
-            } else {
-                muhash /= MuHash3072(data);
-            }
-            break;
-        }
-        case 1: {
-            (void)hash160.Reset();
-            (void)hash256.Reset();
-            (void)ripemd160.Reset();
-            (void)sha1.Reset();
-            (void)sha256.Reset();
-            (void)sha3.Reset();
-            (void)sha512.Reset();
-            muhash = MuHash3072();
-            break;
-        }
-        case 2: {
-            switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 10)) {
-            case 0: {
-                data.resize(CHash160::OUTPUT_SIZE);
-                hash160.Finalize(data);
-                break;
-            }
-            case 1: {
-                data.resize(CHash256::OUTPUT_SIZE);
-                hash256.Finalize(data);
-                break;
-            }
-            case 2: {
-                data.resize(CHMAC_SHA256::OUTPUT_SIZE);
-                hmac_sha256.Finalize(data.data());
-                break;
-            }
-            case 3: {
-                data.resize(CHMAC_SHA512::OUTPUT_SIZE);
-                hmac_sha512.Finalize(data.data());
-                break;
-            }
-            case 4: {
-                data.resize(CRIPEMD160::OUTPUT_SIZE);
-                ripemd160.Finalize(data.data());
-                break;
-            }
-            case 5: {
-                data.resize(CSHA1::OUTPUT_SIZE);
-                sha1.Finalize(data.data());
-                break;
-            }
-            case 6: {
-                data.resize(CSHA256::OUTPUT_SIZE);
-                sha256.Finalize(data.data());
-                break;
-            }
-            case 7: {
-                data.resize(CSHA512::OUTPUT_SIZE);
-                sha512.Finalize(data.data());
-                break;
-            }
-            case 8: {
-                data.resize(1);
-                data[0] = sip_hasher.Finalize() % 256;
-                break;
-            }
-            case 9: {
-                data.resize(SHA3_256::OUTPUT_SIZE);
-                sha3.Finalize(data);
-                break;
-            }
-            case 10: {
-                uint256 out;
-                muhash.Finalize(out);
-                break;
-            }
-            }
-            break;
-        }
-        }
+                if (fuzzed_data_provider.ConsumeBool()) {
+                    muhash *= MuHash3072(data);
+                } else {
+                    muhash /= MuHash3072(data);
+                }
+            },
+            [&] {
+                (void)hash160.Reset();
+                (void)hash256.Reset();
+                (void)ripemd160.Reset();
+                (void)sha1.Reset();
+                (void)sha256.Reset();
+                (void)sha3.Reset();
+                (void)sha512.Reset();
+                muhash = MuHash3072();
+            },
+            [&] {
+                CallOneOf(
+                    fuzzed_data_provider,
+                    [&] {
+                        data.resize(CHash160::OUTPUT_SIZE);
+                        hash160.Finalize(data);
+                    },
+                    [&] {
+                        data.resize(CHash256::OUTPUT_SIZE);
+                        hash256.Finalize(data);
+                    },
+                    [&] {
+                        data.resize(CHMAC_SHA256::OUTPUT_SIZE);
+                        hmac_sha256.Finalize(data.data());
+                    },
+                    [&] {
+                        data.resize(CHMAC_SHA512::OUTPUT_SIZE);
+                        hmac_sha512.Finalize(data.data());
+                    },
+                    [&] {
+                        data.resize(CRIPEMD160::OUTPUT_SIZE);
+                        ripemd160.Finalize(data.data());
+                    },
+                    [&] {
+                        data.resize(CSHA1::OUTPUT_SIZE);
+                        sha1.Finalize(data.data());
+                    },
+                    [&] {
+                        data.resize(CSHA256::OUTPUT_SIZE);
+                        sha256.Finalize(data.data());
+                    },
+                    [&] {
+                        data.resize(CSHA512::OUTPUT_SIZE);
+                        sha512.Finalize(data.data());
+                    },
+                    [&] {
+                        data.resize(1);
+                        data[0] = sip_hasher.Finalize() % 256;
+                    },
+                    [&] {
+                        data.resize(SHA3_256::OUTPUT_SIZE);
+                        sha3.Finalize(data);
+                    },
+                    [&] {
+                        uint256 out;
+                        muhash.Finalize(out);
+                    });
+            });
     }
     if (fuzzed_data_provider.ConsumeBool()) {
         uint64_t state[25];