fuzz: Introduce CallOneOf helper to replace switch-case

Can be reviewed with --ignore-all-space

1 files changed, 32 insertions, 39 deletions

diff --git a/src/test/fuzz/crypto_chacha20_poly1305_aead.cpp b/src/test/fuzz/crypto_chacha20_poly1305_aead.cpp
index 631af9c70d..1f122082b2 100644
--- a/src/test/fuzz/crypto_chacha20_poly1305_aead.cpp
+++ b/src/test/fuzz/crypto_chacha20_poly1305_aead.cpp
@@ -29,44 +29,37 @@ FUZZ_TARGET(crypto_chacha20_poly1305_aead)
     std::vector<uint8_t> out(buffer_size + CHACHA20_POLY1305_AEAD_AAD_LEN + POLY1305_TAGLEN, 0);
     bool is_encrypt = fuzzed_data_provider.ConsumeBool();
     while (fuzzed_data_provider.ConsumeBool()) {
-        switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 6)) {
-        case 0: {
-            buffer_size = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(64, 4096);
-            in = std::vector<uint8_t>(buffer_size + CHACHA20_POLY1305_AEAD_AAD_LEN + POLY1305_TAGLEN, 0);
-            out = std::vector<uint8_t>(buffer_size + CHACHA20_POLY1305_AEAD_AAD_LEN + POLY1305_TAGLEN, 0);
-            break;
-        }
-        case 1: {
-            (void)aead.Crypt(seqnr_payload, seqnr_aad, aad_pos, out.data(), out.size(), in.data(), buffer_size, is_encrypt);
-            break;
-        }
-        case 2: {
-            uint32_t len = 0;
-            const bool ok = aead.GetLength(&len, seqnr_aad, aad_pos, in.data());
-            assert(ok);
-            break;
-        }
-        case 3: {
-            seqnr_payload += 1;
-            aad_pos += CHACHA20_POLY1305_AEAD_AAD_LEN;
-            if (aad_pos + CHACHA20_POLY1305_AEAD_AAD_LEN > CHACHA20_ROUND_OUTPUT) {
-                aad_pos = 0;
-                seqnr_aad += 1;
-            }
-            break;
-        }
-        case 4: {
-            seqnr_payload = fuzzed_data_provider.ConsumeIntegral<int>();
-            break;
-        }
-        case 5: {
-            seqnr_aad = fuzzed_data_provider.ConsumeIntegral<int>();
-            break;
-        }
-        case 6: {
-            is_encrypt = fuzzed_data_provider.ConsumeBool();
-            break;
-        }
-        }
+        CallOneOf(
+            fuzzed_data_provider,
+            [&] {
+                buffer_size = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(64, 4096);
+                in = std::vector<uint8_t>(buffer_size + CHACHA20_POLY1305_AEAD_AAD_LEN + POLY1305_TAGLEN, 0);
+                out = std::vector<uint8_t>(buffer_size + CHACHA20_POLY1305_AEAD_AAD_LEN + POLY1305_TAGLEN, 0);
+            },
+            [&] {
+                (void)aead.Crypt(seqnr_payload, seqnr_aad, aad_pos, out.data(), out.size(), in.data(), buffer_size, is_encrypt);
+            },
+            [&] {
+                uint32_t len = 0;
+                const bool ok = aead.GetLength(&len, seqnr_aad, aad_pos, in.data());
+                assert(ok);
+            },
+            [&] {
+                seqnr_payload += 1;
+                aad_pos += CHACHA20_POLY1305_AEAD_AAD_LEN;
+                if (aad_pos + CHACHA20_POLY1305_AEAD_AAD_LEN > CHACHA20_ROUND_OUTPUT) {
+                    aad_pos = 0;
+                    seqnr_aad += 1;
+                }
+            },
+            [&] {
+                seqnr_payload = fuzzed_data_provider.ConsumeIntegral<int>();
+            },
+            [&] {
+                seqnr_aad = fuzzed_data_provider.ConsumeIntegral<int>();
+            },
+            [&] {
+                is_encrypt = fuzzed_data_provider.ConsumeBool();
+            });
     }
 }