diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp
index 435de296d84..2244734d403 100644
--- a/src/test/fuzz/addrman.cpp
+++ b/src/test/fuzz/addrman.cpp
@@ -130,7 +130,7 @@ FUZZ_TARGET(addrman, .init = initialize_addrman)
         }
     }
     AddrManDeterministic& addr_man = *addr_man_ptr;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -141,7 +141,7 @@ FUZZ_TARGET(addrman, .init = initialize_addrman)
             },
             [&] {
                 std::vector<CAddress> addresses;
-                LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+                LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
                     addresses.push_back(ConsumeAddress(fuzzed_data_provider));
                 }
                 auto net_addr = ConsumeNetAddr(fuzzed_data_provider);
diff --git a/src/test/fuzz/autofile.cpp b/src/test/fuzz/autofile.cpp
index 5aa5d8c1332..0a44590334f 100644
--- a/src/test/fuzz/autofile.cpp
+++ b/src/test/fuzz/autofile.cpp
@@ -24,8 +24,7 @@ FUZZ_TARGET(autofile)
         fuzzed_file_provider.open(),
         Obfuscation{std::span{key_bytes}.first<Obfuscation::KEY_SIZE>()},
     };
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/banman.cpp b/src/test/fuzz/banman.cpp
index aac93c9dad7..2e50720f309 100644
--- a/src/test/fuzz/banman.cpp
+++ b/src/test/fuzz/banman.cpp
@@ -66,8 +66,7 @@ FUZZ_TARGET(banman, .init = initialize_banman)
         // might call DumpBanlist (or other methods that are at least linear
         // complexity of the input size).
         bool contains_invalid{false};
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 300)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 300) {
             CallOneOf(
                 fuzzed_data_provider,
                 [&] {
diff --git a/src/test/fuzz/bip324.cpp b/src/test/fuzz/bip324.cpp
index b787bd16687..6d05ff6b266 100644
--- a/src/test/fuzz/bip324.cpp
+++ b/src/test/fuzz/bip324.cpp
@@ -64,7 +64,7 @@ FUZZ_TARGET(bip324_cipher_roundtrip, .init=Initialize)
     assert(std::ranges::equal(initiator.GetSendGarbageTerminator(), responder.GetReceiveGarbageTerminator()));
     assert(std::ranges::equal(initiator.GetReceiveGarbageTerminator(), responder.GetSendGarbageTerminator()));
 
-    LIMITED_WHILE(provider.remaining_bytes(), 1000) {
+    LIMITED_WHILE (provider.remaining_bytes(), 1000) {
         // Mode:
         // - Bit 0: whether the ignore bit is set in message
         // - Bit 1: whether the responder (0) or initiator (1) sends
diff --git a/src/test/fuzz/bitdeque.cpp b/src/test/fuzz/bitdeque.cpp
index bf6e6ea5830..6e4f06af218 100644
--- a/src/test/fuzz/bitdeque.cpp
+++ b/src/test/fuzz/bitdeque.cpp
@@ -54,8 +54,7 @@ FUZZ_TARGET(bitdeque, .init = InitRandData)
     }
 
     const auto iter_limit{maxlen > 6000 ? 90U : 900U};
-    LIMITED_WHILE(provider.remaining_bytes() > 0, iter_limit)
-    {
+    LIMITED_WHILE (provider.remaining_bytes() > 0, iter_limit) {
         CallOneOf(
             provider,
             [&] {
diff --git a/src/test/fuzz/bitset.cpp b/src/test/fuzz/bitset.cpp
index ce6be0499cf..c5e532c6100 100644
--- a/src/test/fuzz/bitset.cpp
+++ b/src/test/fuzz/bitset.cpp
@@ -68,7 +68,7 @@ void TestType(FuzzBufferType buffer)
         assert(sim[idx].count() == real[idx].Count());
     };
 
-    LIMITED_WHILE(buffer.size() > 0, 1000) {
+    LIMITED_WHILE (buffer.size() > 0, 1000) {
         // Read one byte to determine which operation to execute on the BitSets.
         int command = ReadByte(buffer) % 64;
         // Read another byte that determines which bitsets will be involved.
diff --git a/src/test/fuzz/block_index_tree.cpp b/src/test/fuzz/block_index_tree.cpp
index ad38f6e608f..a4d38974122 100644
--- a/src/test/fuzz/block_index_tree.cpp
+++ b/src/test/fuzz/block_index_tree.cpp
@@ -53,8 +53,7 @@ FUZZ_TARGET(block_index_tree, .init = initialize_block_index_tree)
 
     std::vector<CBlockIndex*> pruned_blocks;
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 1000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 1000) {
         if (abort_run) break;
         CallOneOf(
             fuzzed_data_provider,
diff --git a/src/test/fuzz/blockfilter.cpp b/src/test/fuzz/blockfilter.cpp
index ed0f9e0dd12..39b49c847a2 100644
--- a/src/test/fuzz/blockfilter.cpp
+++ b/src/test/fuzz/blockfilter.cpp
@@ -38,8 +38,7 @@ FUZZ_TARGET(blockfilter)
         (void)gcs_filter.GetEncoded();
         (void)gcs_filter.Match(ConsumeRandomLengthByteVector(fuzzed_data_provider));
         GCSFilter::ElementSet element_set;
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 30000)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 30000) {
             element_set.insert(ConsumeRandomLengthByteVector(fuzzed_data_provider));
         }
         gcs_filter.MatchAny(element_set);
diff --git a/src/test/fuzz/bloom_filter.cpp b/src/test/fuzz/bloom_filter.cpp
index af6d8ae4843..6c14896013c 100644
--- a/src/test/fuzz/bloom_filter.cpp
+++ b/src/test/fuzz/bloom_filter.cpp
@@ -24,8 +24,7 @@ FUZZ_TARGET(bloom_filter)
         1.0 / fuzzed_data_provider.ConsumeIntegralInRange<unsigned int>(1, std::numeric_limits<unsigned int>::max()),
         fuzzed_data_provider.ConsumeIntegral<unsigned int>(),
         static_cast<unsigned char>(fuzzed_data_provider.PickValueInArray({BLOOM_UPDATE_NONE, BLOOM_UPDATE_ALL, BLOOM_UPDATE_P2PUBKEY_ONLY, BLOOM_UPDATE_MASK}))};
-    LIMITED_WHILE(good_data && fuzzed_data_provider.remaining_bytes() > 0, 10'000)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.remaining_bytes() > 0, 10'000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/buffered_file.cpp b/src/test/fuzz/buffered_file.cpp
index 9ba8db2c953..b7b0f13e3da 100644
--- a/src/test/fuzz/buffered_file.cpp
+++ b/src/test/fuzz/buffered_file.cpp
@@ -34,8 +34,7 @@ FUZZ_TARGET(buffered_file)
     }
     if (opt_buffered_file && !fuzzed_file.IsNull()) {
         bool setpos_fail = false;
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
             CallOneOf(
                 fuzzed_data_provider,
                 [&] {
diff --git a/src/test/fuzz/chain.cpp b/src/test/fuzz/chain.cpp
index 4d3a6f42355..c0525655a54 100644
--- a/src/test/fuzz/chain.cpp
+++ b/src/test/fuzz/chain.cpp
@@ -37,7 +37,7 @@ FUZZ_TARGET(chain)
     (void)CDiskBlockIndex{*disk_block_index};
     (void)disk_block_index->BuildSkip();
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const BlockStatus block_status = fuzzed_data_provider.PickValueInArray({
             BlockStatus::BLOCK_VALID_UNKNOWN,
             BlockStatus::BLOCK_VALID_RESERVED,
diff --git a/src/test/fuzz/cluster_linearize.cpp b/src/test/fuzz/cluster_linearize.cpp
index e529078c65d..5e0e30a4a8d 100644
--- a/src/test/fuzz/cluster_linearize.cpp
+++ b/src/test/fuzz/cluster_linearize.cpp
@@ -485,7 +485,7 @@ FUZZ_TARGET(clusterlin_depgraph_sim)
 
     auto last_compaction_pos{real.PositionRange()};
 
-    LIMITED_WHILE(provider.remaining_bytes() > 0, 1000) {
+    LIMITED_WHILE (provider.remaining_bytes() > 0, 1000) {
         int command = provider.ConsumeIntegral<uint8_t>() % 4;
         while (true) {
             // Iterate decreasing command until an applicable branch is found.
diff --git a/src/test/fuzz/cmpctblock.cpp b/src/test/fuzz/cmpctblock.cpp
index 0cdc380848e..e2aea86a89e 100644
--- a/src/test/fuzz/cmpctblock.cpp
+++ b/src/test/fuzz/cmpctblock.cpp
@@ -323,8 +323,7 @@ FUZZ_TARGET(cmpctblock, .init = initialize_cmpctblock)
         return block_info;
     };
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 1000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 1000) {
         CSerializedNetMsg net_msg;
         bool sent_net_msg = true;
         bool requested_hb = false;
diff --git a/src/test/fuzz/coins_view.cpp b/src/test/fuzz/coins_view.cpp
index db81e190b26..c5e579dcfc9 100644
--- a/src/test/fuzz/coins_view.cpp
+++ b/src/test/fuzz/coins_view.cpp
@@ -102,8 +102,7 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
     COutPoint random_out_point;
     Coin random_coin;
     CMutableTransaction random_mutable_transaction;
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 10'000)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 10'000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -196,8 +195,7 @@ void TestCoinsView(FuzzedDataProvider& fuzzed_data_provider, CCoinsViewCache& co
                 size_t dirty_count{0};
                 CCoinsMapMemoryResource resource;
                 CCoinsMap coins_map{0, SaltedOutpointHasher{/*deterministic=*/true}, CCoinsMap::key_equal{}, &resource};
-                LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 10'000)
-                {
+                LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 10'000) {
                     CCoinsCacheEntry coins_cache_entry;
                     if (fuzzed_data_provider.ConsumeBool()) {
                         coins_cache_entry.coin = random_coin;
diff --git a/src/test/fuzz/coinscache_sim.cpp b/src/test/fuzz/coinscache_sim.cpp
index 15ece2e4af0..2181a08ebad 100644
--- a/src/test/fuzz/coinscache_sim.cpp
+++ b/src/test/fuzz/coinscache_sim.cpp
@@ -233,7 +233,7 @@ FUZZ_TARGET(coinscache_sim)
     // Main simulation loop: read commands from the fuzzer input, and apply them
     // to both the real cache stack and the simulation.
     FuzzedDataProvider provider(buffer.data(), buffer.size());
-    LIMITED_WHILE(provider.remaining_bytes(), 10000) {
+    LIMITED_WHILE (provider.remaining_bytes(), 10000) {
         // Every operation (except "Change height") moves current height forward,
         // so it functions as a kind of epoch, making ~all UTXOs unique.
         ++current_height;
diff --git a/src/test/fuzz/connman.cpp b/src/test/fuzz/connman.cpp
index 43acc85226e..195c2f28604 100644
--- a/src/test/fuzz/connman.cpp
+++ b/src/test/fuzz/connman.cpp
@@ -113,7 +113,7 @@ FUZZ_TARGET(connman, .init = initialize_connman)
     std::vector<NodeId> node_ids;
     std::vector<std::string> node_addr_names;
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         CNode& p2p_node{*ConsumeNodeAsUniquePtr(fuzzed_data_provider, steady_clock).release()};
         // Simulate post-handshake state.
         p2p_node.fSuccessfullyConnected = true;
@@ -122,7 +122,7 @@ FUZZ_TARGET(connman, .init = initialize_connman)
         node_addr_names.push_back(p2p_node.m_addr_name);
     }
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/crypto.cpp b/src/test/fuzz/crypto.cpp
index ff918f98b30..c95181f0165 100644
--- a/src/test/fuzz/crypto.cpp
+++ b/src/test/fuzz/crypto.cpp
@@ -38,8 +38,7 @@ FUZZ_TARGET(crypto)
     SHA3_256 sha3;
     CSipHasher sip_hasher{fuzzed_data_provider.ConsumeIntegral<uint64_t>(), fuzzed_data_provider.ConsumeIntegral<uint64_t>()};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 30)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 30) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/crypto_aes256.cpp b/src/test/fuzz/crypto_aes256.cpp
index d35919f2f18..67124479aae 100644
--- a/src/test/fuzz/crypto_aes256.cpp
+++ b/src/test/fuzz/crypto_aes256.cpp
@@ -19,7 +19,7 @@ FUZZ_TARGET(crypto_aes256)
     AES256Encrypt encrypt{key.data()};
     AES256Decrypt decrypt{key.data()};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const std::vector<uint8_t> plaintext = ConsumeFixedLengthByteVector(fuzzed_data_provider, AES_BLOCKSIZE);
         std::vector<uint8_t> ciphertext(AES_BLOCKSIZE);
         encrypt.Encrypt(ciphertext.data(), plaintext.data());
diff --git a/src/test/fuzz/crypto_aes256cbc.cpp b/src/test/fuzz/crypto_aes256cbc.cpp
index 87064b66ddf..81502235b00 100644
--- a/src/test/fuzz/crypto_aes256cbc.cpp
+++ b/src/test/fuzz/crypto_aes256cbc.cpp
@@ -21,7 +21,7 @@ FUZZ_TARGET(crypto_aes256cbc)
     AES256CBCEncrypt encrypt{key.data(), iv.data(), pad};
     AES256CBCDecrypt decrypt{key.data(), iv.data(), pad};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const std::vector<uint8_t> plaintext = ConsumeRandomLengthByteVector(fuzzed_data_provider);
         std::vector<uint8_t> ciphertext(plaintext.size() + AES_BLOCKSIZE);
         const int encrypt_ret = encrypt.Encrypt(plaintext.data(), plaintext.size(), ciphertext.data());
diff --git a/src/test/fuzz/crypto_chacha20.cpp b/src/test/fuzz/crypto_chacha20.cpp
index 15e45419933..652292e6f75 100644
--- a/src/test/fuzz/crypto_chacha20.cpp
+++ b/src/test/fuzz/crypto_chacha20.cpp
@@ -20,7 +20,7 @@ FUZZ_TARGET(crypto_chacha20)
     const auto key = ConsumeFixedLengthByteVector<std::byte>(fuzzed_data_provider, ChaCha20::KEYLEN);
     ChaCha20 chacha20{key};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -144,8 +144,7 @@ FUZZ_TARGET(crypto_fschacha20)
 
     auto fsc20 = FSChaCha20{key, fuzzed_data_provider.ConsumeIntegralInRange<uint32_t>(1, 1024)};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         auto input = fuzzed_data_provider.ConsumeBytes<std::byte>(fuzzed_data_provider.ConsumeIntegralInRange(0, 4096));
         std::vector<std::byte> output;
         output.resize(input.size());
diff --git a/src/test/fuzz/crypto_chacha20poly1305.cpp b/src/test/fuzz/crypto_chacha20poly1305.cpp
index 0f7228f5b4d..42ab6d1ee50 100644
--- a/src/test/fuzz/crypto_chacha20poly1305.cpp
+++ b/src/test/fuzz/crypto_chacha20poly1305.cpp
@@ -39,8 +39,7 @@ FUZZ_TARGET(crypto_aeadchacha20poly1305)
     // data).
     InsecureRandomContext rng(provider.ConsumeIntegral<uint64_t>());
 
-    LIMITED_WHILE(provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (provider.ConsumeBool(), 100) {
         // Mode:
         // - Bit 0: whether to use single-plain Encrypt/Decrypt; otherwise use a split at prefix.
         // - Bit 2: whether this ciphertext will be corrupted (making it the last sent one)
@@ -130,8 +129,7 @@ FUZZ_TARGET(crypto_fschacha20poly1305)
     // data).
     InsecureRandomContext rng(provider.ConsumeIntegral<uint64_t>());
 
-    LIMITED_WHILE(provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (provider.ConsumeBool(), 100) {
         // Mode:
         // - Bit 0: whether to use single-plain Encrypt/Decrypt; otherwise use a split at prefix.
         // - Bit 2: whether this ciphertext will be corrupted (making it the last sent one)
diff --git a/src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp b/src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp
index f5ca9aee8fe..ef4f02a5f5d 100644
--- a/src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp
+++ b/src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp
@@ -18,7 +18,7 @@ FUZZ_TARGET(crypto_hkdf_hmac_sha256_l32)
     const std::vector<uint8_t> initial_key_material = ConsumeRandomLengthByteVector(fuzzed_data_provider);
 
     CHKDF_HMAC_SHA256_L32 hkdf_hmac_sha256_l32(initial_key_material.data(), initial_key_material.size(), fuzzed_data_provider.ConsumeRandomLengthString(1024));
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         std::vector<uint8_t> out(32);
         hkdf_hmac_sha256_l32.Expand32(fuzzed_data_provider.ConsumeRandomLengthString(128), out.data());
     }
diff --git a/src/test/fuzz/crypto_poly1305.cpp b/src/test/fuzz/crypto_poly1305.cpp
index 5a4404cf430..249322cbded 100644
--- a/src/test/fuzz/crypto_poly1305.cpp
+++ b/src/test/fuzz/crypto_poly1305.cpp
@@ -34,7 +34,7 @@ FUZZ_TARGET(crypto_poly1305_split)
     std::vector<std::byte> total_input;
 
     // Process input in pieces.
-    LIMITED_WHILE(provider.remaining_bytes(), 100) {
+    LIMITED_WHILE (provider.remaining_bytes(), 100) {
         auto in = ConsumeRandomLengthByteVector<std::byte>(provider);
         poly_split.Update(in);
         // Update total_input to match what was processed.
diff --git a/src/test/fuzz/cuckoocache.cpp b/src/test/fuzz/cuckoocache.cpp
index 55da81ffdb4..d6c38ea0f28 100644
--- a/src/test/fuzz/cuckoocache.cpp
+++ b/src/test/fuzz/cuckoocache.cpp
@@ -38,7 +38,7 @@ FUZZ_TARGET(cuckoocache)
     } else {
         cuckoo_cache.setup(fuzzed_data_provider.ConsumeIntegralInRange<uint32_t>(0, 4096));
     }
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         if (fuzzed_data_provider.ConsumeBool()) {
             cuckoo_cache.insert(fuzzed_data_provider.ConsumeBool());
         } else {
diff --git a/src/test/fuzz/dbwrapper.cpp b/src/test/fuzz/dbwrapper.cpp
index 265f0ca3a09..8d9c11ad997 100644
--- a/src/test/fuzz/dbwrapper.cpp
+++ b/src/test/fuzz/dbwrapper.cpp
@@ -215,8 +215,7 @@ void TestDbWrapper(FuzzedDataProvider& provider,
     // Oracle: key → value size. Content is reconstructed via MakeValue().
     Oracle oracle;
 
-    LIMITED_WHILE(provider.ConsumeBool(), 1'000)
-    {
+    LIMITED_WHILE (provider.ConsumeBool(), 1'000) {
         CallOneOf(
             provider,
             // --- Mutations ---
@@ -238,8 +237,7 @@ void TestDbWrapper(FuzzedDataProvider& provider,
                 std::map<uint16_t, uint32_t> batch_writes;
                 std::set<uint16_t> batch_erases;
                 const auto fill{[&] {
-                    LIMITED_WHILE(provider.ConsumeBool(), 20)
-                    {
+                    LIMITED_WHILE (provider.ConsumeBool(), 20) {
                         const auto key{ConsumeKey(provider)};
                         if (provider.ConsumeBool()) {
                             const auto size{ConsumeValueSize(provider)};
diff --git a/src/test/fuzz/feeratediagram.cpp b/src/test/fuzz/feeratediagram.cpp
index 3a2d4e4ae26..a1e51a66603 100644
--- a/src/test/fuzz/feeratediagram.cpp
+++ b/src/test/fuzz/feeratediagram.cpp
@@ -92,8 +92,7 @@ void PopulateChunks(FuzzedDataProvider& fuzzed_data_provider, std::vector<FeeFra
 {
     chunks.clear();
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 50)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 50) {
         chunks.emplace_back(fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(INT32_MIN>>1, INT32_MAX>>1), fuzzed_data_provider.ConsumeIntegralInRange<int32_t>(1, 1000000));
     }
     return;
@@ -122,7 +121,7 @@ FUZZ_TARGET(build_and_compare_feerate_diagram)
     assert(real == sim);
 
     // Do explicit evaluation at up to 1000 points, and verify consistency with the result.
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes(), 1000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes(), 1000) {
         int32_t size = fuzzed_data_provider.ConsumeIntegralInRange<int32_t>(0, diagram2.back().size);
         auto eval1 = EvaluateDiagram(size, diagram1);
         auto eval2 = EvaluateDiagram(size, diagram2);
diff --git a/src/test/fuzz/fees.cpp b/src/test/fuzz/fees.cpp
index 1bd5c67a204..1940e342c67 100644
--- a/src/test/fuzz/fees.cpp
+++ b/src/test/fuzz/fees.cpp
@@ -21,7 +21,7 @@ FUZZ_TARGET(fees)
     const CFeeRate minimal_incremental_fee{ConsumeMoney(fuzzed_data_provider)};
     FastRandomContext rng{/*fDeterministic=*/true};
     FeeFilterRounder fee_filter_rounder{minimal_incremental_fee, rng};
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const CAmount current_minimum_fee = ConsumeMoney(fuzzed_data_provider);
         const CAmount rounded_fee = fee_filter_rounder.round(current_minimum_fee);
         assert(MoneyRange(rounded_fee));
diff --git a/src/test/fuzz/merkleblock.cpp b/src/test/fuzz/merkleblock.cpp
index 86916fdfbb7..76c5668fa19 100644
--- a/src/test/fuzz/merkleblock.cpp
+++ b/src/test/fuzz/merkleblock.cpp
@@ -34,7 +34,7 @@ FUZZ_TARGET(merkleblock)
                 if (fuzzed_data_provider.ConsumeBool()) {
                     merkle_block = CMerkleBlock{*opt_block, bloom_filter};
                 } else if (fuzzed_data_provider.ConsumeBool()) {
-                    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+                    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
                         txids.insert(Txid::FromUint256(ConsumeUInt256(fuzzed_data_provider)));
                     }
                     merkle_block = CMerkleBlock{*opt_block, txids};
diff --git a/src/test/fuzz/mini_miner.cpp b/src/test/fuzz/mini_miner.cpp
index 27bf3237922..8848a0cddca 100644
--- a/src/test/fuzz/mini_miner.cpp
+++ b/src/test/fuzz/mini_miner.cpp
@@ -57,8 +57,7 @@ FUZZ_TARGET(mini_miner, .init = initialize_miner)
     std::deque<COutPoint> available_coins = g_available_coins;
     LOCK2(::cs_main, pool.cs);
     // Cluster size cannot exceed 500
-    LIMITED_WHILE(!available_coins.empty(), 100)
-    {
+    LIMITED_WHILE (!available_coins.empty(), 100) {
         CMutableTransaction mtx = CMutableTransaction();
         const size_t num_inputs = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, available_coins.size());
         const size_t num_outputs = fuzzed_data_provider.ConsumeIntegralInRange<size_t>(1, 50);
@@ -95,7 +94,6 @@ FUZZ_TARGET(mini_miner, .init = initialize_miner)
                 outpoints.push_back(*outpoint);
             }
         }
-
     }
 
     const CFeeRate target_feerate{CFeeRate{ConsumeMoney(fuzzed_data_provider, /*max=*/MAX_MONEY/1000)}};
diff --git a/src/test/fuzz/minisketch.cpp b/src/test/fuzz/minisketch.cpp
index 48b211aff55..919f4b4b21d 100644
--- a/src/test/fuzz/minisketch.cpp
+++ b/src/test/fuzz/minisketch.cpp
@@ -36,8 +36,7 @@ FUZZ_TARGET(minisketch)
 
     // Fill two sets and keep the difference in a map
     std::map<uint32_t, bool> diff;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const auto entry{fuzzed_data_provider.ConsumeIntegralInRange<uint32_t>(1, std::numeric_limits<uint32_t>::max() - 1)};
         const auto KeepDiff{[&] {
             bool& mut{diff[entry]};
diff --git a/src/test/fuzz/net.cpp b/src/test/fuzz/net.cpp
index 8ee08ed623d..594c1b197c4 100644
--- a/src/test/fuzz/net.cpp
+++ b/src/test/fuzz/net.cpp
@@ -41,7 +41,7 @@ FUZZ_TARGET(net, .init = initialize_net)
     {
         node.SetAddrLocal(*service_opt);
     }
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -90,7 +90,7 @@ FUZZ_TARGET(local_address, .init = initialize_net)
         LOCK(g_maplocalhost_mutex);
         mapLocalHost.clear();
     }
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/netbase_dns_lookup.cpp b/src/test/fuzz/netbase_dns_lookup.cpp
index ebcf84f5a74..e0c377ee17b 100644
--- a/src/test/fuzz/netbase_dns_lookup.cpp
+++ b/src/test/fuzz/netbase_dns_lookup.cpp
@@ -22,7 +22,7 @@ FUZZ_TARGET(netbase_dns_lookup)
 
     auto fuzzed_dns_lookup_function = [&](const std::string&, bool) {
         std::vector<CNetAddr> resolved_addresses;
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
             resolved_addresses.push_back(ConsumeNetAddr(fuzzed_data_provider));
         }
         return resolved_addresses;
diff --git a/src/test/fuzz/node_eviction.cpp b/src/test/fuzz/node_eviction.cpp
index 562ece8be47..9ef53fee18a 100644
--- a/src/test/fuzz/node_eviction.cpp
+++ b/src/test/fuzz/node_eviction.cpp
@@ -19,8 +19,7 @@ FUZZ_TARGET(node_eviction)
 {
     FuzzedDataProvider fuzzed_data_provider{buffer.data(), buffer.size()};
     std::vector<NodeEvictionCandidate> eviction_candidates;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         eviction_candidates.push_back({
             /*id=*/fuzzed_data_provider.ConsumeIntegral<NodeId>(),
             /*m_connected=*/ConsumeTime(fuzzed_data_provider),
diff --git a/src/test/fuzz/p2p_handshake.cpp b/src/test/fuzz/p2p_handshake.cpp
index e0c8ac160aa..a71a61b85c9 100644
--- a/src/test/fuzz/p2p_handshake.cpp
+++ b/src/test/fuzz/p2p_handshake.cpp
@@ -72,8 +72,7 @@ FUZZ_TARGET(p2p_handshake, .init = ::initialize)
             static_cast<ServiceFlags>(fuzzed_data_provider.ConsumeIntegral<uint64_t>()));
     }
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         CNode& connection = *PickValue(fuzzed_data_provider, peers);
         if (connection.fDisconnect || connection.fSuccessfullyConnected) {
             // Skip if the connection was disconnected or if the version
diff --git a/src/test/fuzz/p2p_headers_presync.cpp b/src/test/fuzz/p2p_headers_presync.cpp
index fa041f34fe4..00c6dbe06e0 100644
--- a/src/test/fuzz/p2p_headers_presync.cpp
+++ b/src/test/fuzz/p2p_headers_presync.cpp
@@ -180,8 +180,7 @@ FUZZ_TARGET(p2p_headers_presync, .init = initialize)
 
     std::vector<CBlockHeader> all_headers;
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         auto finalized_block = [&]() {
             CBlock block = ConsumeBlock(fuzzed_data_provider, base.GetHash(), base.nBits);
             FinalizeHeader(block, chainman);
diff --git a/src/test/fuzz/p2p_transport_serialization.cpp b/src/test/fuzz/p2p_transport_serialization.cpp
index 82b282d3eb0..e457d93cd1f 100644
--- a/src/test/fuzz/p2p_transport_serialization.cpp
+++ b/src/test/fuzz/p2p_transport_serialization.cpp
@@ -294,7 +294,7 @@ void SimulationTest(Transport& initiator, Transport& responder, R& rng, FuzzedDa
     };
 
     // Main loop, interleaving new messages, sends, and receives.
-    LIMITED_WHILE(provider.remaining_bytes(), 1000) {
+    LIMITED_WHILE (provider.remaining_bytes(), 1000) {
         CallOneOf(provider,
             // (Try to) give the next message to the transport.
             [&] { new_msg_fn(/*side=*/0); },
diff --git a/src/test/fuzz/package_eval.cpp b/src/test/fuzz/package_eval.cpp
index bcf76cf3525..5d94cb188e9 100644
--- a/src/test/fuzz/package_eval.cpp
+++ b/src/test/fuzz/package_eval.cpp
@@ -237,8 +237,7 @@ FUZZ_TARGET(ephemeral_package_eval, .init = initialize_tx_pool)
 
     chainstate.SetMempool(&tx_pool);
 
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 300)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 300) {
         Assert(!mempool_outpoints.empty());
 
         std::vector<CTransactionRef> txs;
@@ -392,8 +391,7 @@ FUZZ_TARGET(tx_package_eval, .init = initialize_tx_pool)
 
     chainstate.SetMempool(&tx_pool);
 
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 300)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 300) {
         Assert(!mempool_outpoints.empty());
 
         std::vector<CTransactionRef> txs;
diff --git a/src/test/fuzz/policy_estimator.cpp b/src/test/fuzz/policy_estimator.cpp
index 576ab8cd381..1e137a674dd 100644
--- a/src/test/fuzz/policy_estimator.cpp
+++ b/src/test/fuzz/policy_estimator.cpp
@@ -39,8 +39,7 @@ FUZZ_TARGET(policy_estimator, .init = initialize_policy_estimator)
         [&] { current_height = fuzzed_data_provider.ConsumeIntegralInRange<decltype(current_height)>(current_height, 1 << 30); },
     };
     advance_height();
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 10'000)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 10'000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -66,8 +65,7 @@ FUZZ_TARGET(policy_estimator, .init = initialize_policy_estimator)
             },
             [&] {
                 std::list<CTxMemPoolEntry> mempool_entries;
-                LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-                {
+                LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
                     const std::optional<CMutableTransaction> mtx = ConsumeDeserializable<CMutableTransaction>(fuzzed_data_provider, TX_WITH_WITNESS);
                     if (!mtx) {
                         good_data = false;
diff --git a/src/test/fuzz/poolresource.cpp b/src/test/fuzz/poolresource.cpp
index 2b2b33bfbf9..e5455feb1dc 100644
--- a/src/test/fuzz/poolresource.cpp
+++ b/src/test/fuzz/poolresource.cpp
@@ -116,8 +116,7 @@ public:
 
     void Fuzz()
     {
-        LIMITED_WHILE(m_provider.ConsumeBool(), 10000)
-        {
+        LIMITED_WHILE (m_provider.ConsumeBool(), 10000) {
             CallOneOf(
                 m_provider,
                 [&] { Allocate(); },
diff --git a/src/test/fuzz/pow.cpp b/src/test/fuzz/pow.cpp
index a9151ca500c..b60de392892 100644
--- a/src/test/fuzz/pow.cpp
+++ b/src/test/fuzz/pow.cpp
@@ -30,7 +30,7 @@ FUZZ_TARGET(pow, .init = initialize_pow)
     std::vector<std::unique_ptr<CBlockIndex>> blocks;
     const uint32_t fixed_time = fuzzed_data_provider.ConsumeIntegral<uint32_t>();
     const uint32_t fixed_bits = fuzzed_data_provider.ConsumeIntegral<uint32_t>();
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 10000) {
         const std::optional<CBlockHeader> block_header = ConsumeDeserializable<CBlockHeader>(fuzzed_data_provider);
         if (!block_header) {
             continue;
diff --git a/src/test/fuzz/prevector.cpp b/src/test/fuzz/prevector.cpp
index aba6dca1b4f..a96dc863cf5 100644
--- a/src/test/fuzz/prevector.cpp
+++ b/src/test/fuzz/prevector.cpp
@@ -207,8 +207,7 @@ FUZZ_TARGET(prevector)
     FuzzedDataProvider prov(buffer.data(), buffer.size());
     prevector_tester<8, int> test;
 
-    LIMITED_WHILE(prov.remaining_bytes(), 3000)
-    {
+    LIMITED_WHILE (prov.remaining_bytes(), 3000) {
         switch (prov.ConsumeIntegralInRange<int>(0, 13 + 3 * (test.size() > 0))) {
         case 0: {
             auto position = prov.ConsumeIntegralInRange<size_t>(0, test.size());
diff --git a/src/test/fuzz/private_broadcast.cpp b/src/test/fuzz/private_broadcast.cpp
index ae834ce6ac3..cd93cefa33b 100644
--- a/src/test/fuzz/private_broadcast.cpp
+++ b/src/test/fuzz/private_broadcast.cpp
@@ -60,7 +60,7 @@ FUZZ_TARGET(private_broadcast)
         return fdp.ConsumeIntegralInRange<NodeId>(0, next_nodeid - 1);
     };
 
-    LIMITED_WHILE(fdp.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fdp.ConsumeBool(), 10000) {
         CallOneOf(
             fdp,
             [&] { // Add()
diff --git a/src/test/fuzz/process_messages.cpp b/src/test/fuzz/process_messages.cpp
index fd0c9abf1c8..89c03fa6183 100644
--- a/src/test/fuzz/process_messages.cpp
+++ b/src/test/fuzz/process_messages.cpp
@@ -107,8 +107,7 @@ FUZZ_TARGET(process_messages, .init = initialize_process_messages)
         connman.AddTestNode(p2p_node);
     }
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 30)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 30) {
         const std::string random_message_type{fuzzed_data_provider.ConsumeBytesAsString(CMessageHeader::MESSAGE_TYPE_SIZE).c_str()};
 
         clock.set(ConsumeTime(fuzzed_data_provider));
diff --git a/src/test/fuzz/rbf.cpp b/src/test/fuzz/rbf.cpp
index a94d2b9dc7a..107a70a8af2 100644
--- a/src/test/fuzz/rbf.cpp
+++ b/src/test/fuzz/rbf.cpp
@@ -64,8 +64,7 @@ FUZZ_TARGET(rbf, .init = initialize_rbf)
     CTxMemPool pool{MemPoolOptionsForTest(g_setup->m_node), error};
     Assert(error.empty());
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), NUM_ITERS)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), NUM_ITERS) {
         const std::optional<CMutableTransaction> another_mtx = ConsumeDeserializable<CMutableTransaction>(fuzzed_data_provider, TX_WITH_WITNESS);
         if (!another_mtx) {
             break;
diff --git a/src/test/fuzz/rolling_bloom_filter.cpp b/src/test/fuzz/rolling_bloom_filter.cpp
index 977b1c4bfd2..73c06e3ee48 100644
--- a/src/test/fuzz/rolling_bloom_filter.cpp
+++ b/src/test/fuzz/rolling_bloom_filter.cpp
@@ -23,8 +23,7 @@ FUZZ_TARGET(rolling_bloom_filter)
     CRollingBloomFilter rolling_bloom_filter{
         fuzzed_data_provider.ConsumeIntegralInRange<unsigned int>(1, 1000),
         0.999 / fuzzed_data_provider.ConsumeIntegralInRange<unsigned int>(1, std::numeric_limits<unsigned int>::max())};
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 3000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 3000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/rpc.cpp b/src/test/fuzz/rpc.cpp
index e3d3e540dcb..ed9b2c6f407 100644
--- a/src/test/fuzz/rpc.cpp
+++ b/src/test/fuzz/rpc.cpp
@@ -325,8 +325,7 @@ std::string ConsumeScalarRPCArgument(FuzzedDataProvider& fuzzed_data_provider, b
 std::string ConsumeArrayRPCArgument(FuzzedDataProvider& fuzzed_data_provider, bool& good_data)
 {
     std::vector<std::string> scalar_arguments;
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 100) {
         scalar_arguments.push_back(ConsumeScalarRPCArgument(fuzzed_data_provider, good_data));
     }
     return "[\"" + Join(scalar_arguments, "\",\"") + "\"]";
@@ -382,8 +381,7 @@ FUZZ_TARGET(rpc, .init = initialize_rpc)
         return;
     }
     std::vector<std::string> arguments;
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 100) {
         arguments.push_back(ConsumeRPCArgument(fuzzed_data_provider, good_data));
     }
     try {
diff --git a/src/test/fuzz/script_descriptor_cache.cpp b/src/test/fuzz/script_descriptor_cache.cpp
index 329a04eac43..91a98b6ff19 100644
--- a/src/test/fuzz/script_descriptor_cache.cpp
+++ b/src/test/fuzz/script_descriptor_cache.cpp
@@ -17,7 +17,7 @@ FUZZ_TARGET(script_descriptor_cache)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     DescriptorCache descriptor_cache;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const std::vector<uint8_t> code = fuzzed_data_provider.ConsumeBytes<uint8_t>(BIP32_EXTKEY_SIZE);
         if (code.size() == BIP32_EXTKEY_SIZE) {
             CExtPubKey xpub;
diff --git a/src/test/fuzz/script_ops.cpp b/src/test/fuzz/script_ops.cpp
index 5c5f60f2e31..99d62133e52 100644
--- a/src/test/fuzz/script_ops.cpp
+++ b/src/test/fuzz/script_ops.cpp
@@ -15,7 +15,7 @@ FUZZ_TARGET(script_ops)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     CScript script_mut = ConsumeScript(fuzzed_data_provider);
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 1000000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 1000000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/script_sign.cpp b/src/test/fuzz/script_sign.cpp
index ba269beddd4..be7c2d28982 100644
--- a/src/test/fuzz/script_sign.cpp
+++ b/src/test/fuzz/script_sign.cpp
@@ -49,7 +49,7 @@ FUZZ_TARGET(script_sign, .init = initialize_script_sign)
 
     {
         std::map<CPubKey, KeyOriginInfo> hd_keypaths;
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
             const std::optional<CPubKey> pub_key = ConsumeDeserializable<CPubKey>(fuzzed_data_provider);
             if (!pub_key) {
                 break;
diff --git a/src/test/fuzz/scriptnum_ops.cpp b/src/test/fuzz/scriptnum_ops.cpp
index eab774db9ab..35836fe9b48 100644
--- a/src/test/fuzz/scriptnum_ops.cpp
+++ b/src/test/fuzz/scriptnum_ops.cpp
@@ -28,7 +28,7 @@ FUZZ_TARGET(scriptnum_ops)
 {
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     CScriptNum script_num = ConsumeScriptNum(fuzzed_data_provider);
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 1000000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 1000000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/system.cpp b/src/test/fuzz/system.cpp
index 9d0978ce780..03eed3caed6 100644
--- a/src/test/fuzz/system.cpp
+++ b/src/test/fuzz/system.cpp
@@ -38,8 +38,7 @@ FUZZ_TARGET(system, .init = initialize_system)
         SetupHelpOptions(args_manager);
     }
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 3000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 3000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/timeoffsets.cpp b/src/test/fuzz/timeoffsets.cpp
index dfa4dd705d9..9776ff45065 100644
--- a/src/test/fuzz/timeoffsets.cpp
+++ b/src/test/fuzz/timeoffsets.cpp
@@ -22,7 +22,7 @@ FUZZ_TARGET(timeoffsets, .init = initialize_timeoffsets)
     FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
     node::Warnings warnings{};
     TimeOffsets offsets{warnings};
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes() > 0, 4'000) {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes() > 0, 4'000) {
         (void)offsets.Median();
         offsets.Add(std::chrono::seconds{fuzzed_data_provider.ConsumeIntegral<std::chrono::seconds::rep>()});
         offsets.WarnIfOutOfSync();
diff --git a/src/test/fuzz/torcontrol.cpp b/src/test/fuzz/torcontrol.cpp
index e45f1e62d1c..50fe82ffc57 100644
--- a/src/test/fuzz/torcontrol.cpp
+++ b/src/test/fuzz/torcontrol.cpp
@@ -25,7 +25,7 @@ FUZZ_TARGET(torcontrol, .init = initialize_torcontrol)
     CThreadInterrupt interrupt;
     TorControlConnection conn{interrupt};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         TorControlReply tor_control_reply;
         CallOneOf(
             fuzzed_data_provider,
diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp
index 23c40c9fc44..03a16eb7e68 100644
--- a/src/test/fuzz/tx_pool.cpp
+++ b/src/test/fuzz/tx_pool.cpp
@@ -273,8 +273,7 @@ FUZZ_TARGET(tx_pool_standard, .init = initialize_tx_pool)
         return coin.out.nValue;
     };
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         {
             // Total supply is the mempool fee + all outpoints
             CAmount supply_now{WITH_LOCK(tx_pool.cs, return tx_pool.GetTotalFee())};
@@ -455,8 +454,7 @@ FUZZ_TARGET(tx_pool, .init = initialize_tx_pool)
     // If we ever bypass limits, do not do TRUC invariants checks
     bool ever_bypassed_limits{false};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 300)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 300) {
         const auto mut_tx = ConsumeTransaction(fuzzed_data_provider, txids);
 
         if (fuzzed_data_provider.ConsumeBool()) {
diff --git a/src/test/fuzz/txdownloadman.cpp b/src/test/fuzz/txdownloadman.cpp
index ab08fd25435..c7a41da9485 100644
--- a/src/test/fuzz/txdownloadman.cpp
+++ b/src/test/fuzz/txdownloadman.cpp
@@ -73,7 +73,7 @@ static std::vector<COutPoint> PickCoins(FuzzedDataProvider& fuzzed_data_provider
 {
     std::vector<COutPoint> ret;
     ret.push_back(fuzzed_data_provider.PickValueInArray(COINS));
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10) {
         ret.push_back(fuzzed_data_provider.PickValueInArray(COINS));
     }
     return ret;
@@ -179,8 +179,7 @@ FUZZ_TARGET(txdownloadman, .init = initialize)
 
     std::chrono::microseconds time{244466666};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 500)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 500) {
         NodeId rand_peer = fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(0, NUM_PEERS - 1);
 
         // Transaction can be one of the premade ones or a randomly generated one
@@ -304,8 +303,7 @@ FUZZ_TARGET(txdownloadman_impl, .init = initialize)
 
     std::chrono::microseconds time{244466666};
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 500)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 500) {
         NodeId rand_peer = fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(0, NUM_PEERS - 1);
 
         // Transaction can be one of the premade ones or a randomly generated one
diff --git a/src/test/fuzz/txgraph.cpp b/src/test/fuzz/txgraph.cpp
index 88091fb00ba..90b7cad38b6 100644
--- a/src/test/fuzz/txgraph.cpp
+++ b/src/test/fuzz/txgraph.cpp
@@ -438,7 +438,7 @@ FUZZ_TARGET(txgraph)
         return chunk_feerates;
     };
 
-    LIMITED_WHILE(provider.remaining_bytes() > 0, 200) {
+    LIMITED_WHILE (provider.remaining_bytes() > 0, 200) {
         // Read a one-byte command.
         int command = provider.ConsumeIntegral<uint8_t>();
         int orig_command = command;
diff --git a/src/test/fuzz/txorphan.cpp b/src/test/fuzz/txorphan.cpp
index fcb530b03da..9466f776249 100644
--- a/src/test/fuzz/txorphan.cpp
+++ b/src/test/fuzz/txorphan.cpp
@@ -56,8 +56,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
 
     std::vector<CTransactionRef> tx_history;
 
-    LIMITED_WHILE(outpoints.size() < 200'000 && fuzzed_data_provider.ConsumeBool(), 1000)
-    {
+    LIMITED_WHILE (outpoints.size() < 200'000 && fuzzed_data_provider.ConsumeBool(), 1000) {
         // construct transaction
         const CTransactionRef tx = [&] {
             CMutableTransaction tx_mut;
@@ -104,8 +103,7 @@ FUZZ_TARGET(txorphan, .init = initialize_orphanage)
         }
 
         // trigger orphanage functions
-        LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 1000)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 1000) {
             NodeId peer_id = fuzzed_data_provider.ConsumeIntegral<NodeId>();
             const auto total_bytes_start{orphanage->TotalOrphanUsage()};
             const auto total_peer_bytes_start{orphanage->UsageByPeer(peer_id)};
@@ -267,8 +265,7 @@ FUZZ_TARGET(txorphan_protected, .init = initialize_orphanage)
     // These are honest peer's live announcements. We expect them to be protected from eviction.
     std::set<Wtxid> protected_wtxids;
 
-    LIMITED_WHILE(outpoints.size() < 400 && fuzzed_data_provider.ConsumeBool(), 1000)
-    {
+    LIMITED_WHILE (outpoints.size() < 400 && fuzzed_data_provider.ConsumeBool(), 1000) {
         // construct transaction
         const CTransactionRef tx = [&] {
             CMutableTransaction tx_mut;
@@ -303,8 +300,7 @@ FUZZ_TARGET(txorphan_protected, .init = initialize_orphanage)
         const auto wtxid{tx->GetWitnessHash()};
 
         // orphanage functions
-        LIMITED_WHILE(fuzzed_data_provider.remaining_bytes(), 10 * global_latency_score_limit)
-        {
+        LIMITED_WHILE (fuzzed_data_provider.remaining_bytes(), 10 * global_latency_score_limit) {
             NodeId peer_id = fuzzed_data_provider.ConsumeIntegralInRange<NodeId>(0, num_peers - 1);
             const auto tx_weight{GetTransactionWeight(*tx)};
 
@@ -566,7 +562,7 @@ FUZZ_TARGET(txorphanage_sim)
     // 5. Run through a scenario of mutators on both real and simulated orphanage.
     //
 
-    LIMITED_WHILE(provider.remaining_bytes() > 0, 200) {
+    LIMITED_WHILE (provider.remaining_bytes() > 0, 200) {
         int command = provider.ConsumeIntegralInRange<uint8_t>(0, 15);
         while (true) {
             if (sim_announcements.size() < MAX_ANN && command-- == 0) {
@@ -598,7 +594,7 @@ FUZZ_TARGET(txorphanage_sim)
                 assert(erased == sim_have);
                 std::erase_if(sim_announcements, [&](auto& ann) { return ann.tx == tx; });
                 break;
-           } else if (command-- == 0) {
+            } else if (command-- == 0) {
                 // EraseForPeer
                 auto peer = read_peer_fn();
                 real->EraseForPeer(peer);
diff --git a/src/test/fuzz/util.cpp b/src/test/fuzz/util.cpp
index da0e2dea460..169f6838439 100644
--- a/src/test/fuzz/util.cpp
+++ b/src/test/fuzz/util.cpp
@@ -166,7 +166,7 @@ uint32_t ConsumeSequence(FuzzedDataProvider& fuzzed_data_provider) noexcept
 std::map<COutPoint, Coin> ConsumeCoins(FuzzedDataProvider& fuzzed_data_provider) noexcept
 {
     std::map<COutPoint, Coin> coins;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const std::optional<COutPoint> outpoint{ConsumeDeserializable<COutPoint>(fuzzed_data_provider)};
         if (!outpoint) {
             break;
diff --git a/src/test/fuzz/utxo_total_supply.cpp b/src/test/fuzz/utxo_total_supply.cpp
index a6e70372c32..8552840d243 100644
--- a/src/test/fuzz/utxo_total_supply.cpp
+++ b/src/test/fuzz/utxo_total_supply.cpp
@@ -145,8 +145,7 @@ FUZZ_TARGET(utxo_total_supply)
 
     // Limit to avoid timeout, but enough to cover duplicate_coinbase_height
     // and CVE-2018-17144.
-    LIMITED_WHILE(fuzzed_data_provider.remaining_bytes(), 2'00)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.remaining_bytes(), 2'00) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/test/fuzz/vecdeque.cpp b/src/test/fuzz/vecdeque.cpp
index 30fc2da03f4..1756a85996c 100644
--- a/src/test/fuzz/vecdeque.cpp
+++ b/src/test/fuzz/vecdeque.cpp
@@ -52,7 +52,7 @@ void TestType(std::span<const uint8_t> buffer, uint64_t rng_tweak)
         }
     };
 
-    LIMITED_WHILE(provider.remaining_bytes(), MAX_OPERATIONS) {
+    LIMITED_WHILE (provider.remaining_bytes(), MAX_OPERATIONS) {
         int command = provider.ConsumeIntegral<uint8_t>() % 64;
         unsigned idx = real.empty() ? 0 : provider.ConsumeIntegralInRange<unsigned>(0, real.size() - 1);
         const size_t num_buffers = sim.size();
diff --git a/src/wallet/test/fuzz/coincontrol.cpp b/src/wallet/test/fuzz/coincontrol.cpp
index 870eab89490..c7ed5aa2358 100644
--- a/src/wallet/test/fuzz/coincontrol.cpp
+++ b/src/wallet/test/fuzz/coincontrol.cpp
@@ -32,8 +32,7 @@ FUZZ_TARGET(coincontrol, .init = initialize_coincontrol)
     CCoinControl coin_control;
     COutPoint out_point;
 
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/wallet/test/fuzz/coinselection.cpp b/src/wallet/test/fuzz/coinselection.cpp
index 42a53a83c34..8949a6c20d2 100644
--- a/src/wallet/test/fuzz/coinselection.cpp
+++ b/src/wallet/test/fuzz/coinselection.cpp
@@ -50,8 +50,7 @@ static void GroupCoins(FuzzedDataProvider& fuzzed_data_provider, const std::vect
 static CAmount CreateCoins(FuzzedDataProvider& fuzzed_data_provider, std::vector<COutput>& utxo_pool, CoinSelectionParams& coin_params, int& next_locktime)
 {
     CAmount total_balance{0};
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const int n_input{fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 10)};
         const int n_input_bytes{fuzzed_data_provider.ConsumeIntegralInRange<int>(41, 10000)};
         const CAmount amount{fuzzed_data_provider.ConsumeIntegralInRange<CAmount>(1, MAX_MONEY)};
@@ -102,8 +101,7 @@ FUZZ_TARGET(coin_grinder)
     CAmount total_balance{0};
     CAmount max_spendable{0};
     int next_locktime{0};
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         const int n_input{fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 10)};
         const int n_input_bytes{fuzzed_data_provider.ConsumeIntegralInRange<int>(41, 10000)};
         const CAmount amount{fuzzed_data_provider.ConsumeIntegralInRange<CAmount>(1, MAX_MONEY)};
@@ -152,8 +150,7 @@ FUZZ_TARGET(coin_grinder_is_optimal)
     int next_locktime{0};
     static constexpr unsigned max_output_groups{16};
     std::vector<OutputGroup> group_pos;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), max_output_groups)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), max_output_groups) {
         // With maximum m_effective_feerate and n_input_bytes = 1'000'000, input_fee <= MAX_MONEY.
         const int n_input_bytes{fuzzed_data_provider.ConsumeIntegralInRange<int>(1, 1'000'000)};
         // Only make UTXOs with positive effective value
@@ -250,8 +247,7 @@ FUZZ_TARGET(bnb_finds_min_waste)
     // Choose 1–16 of 16 provides ample fuzzing space.
     static constexpr unsigned max_output_groups{16};
     std::vector<OutputGroup> group_pos;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), max_output_groups)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), max_output_groups) {
         // With maximum m_effective_feerate 10'000 s/vB and n_input_bytes = 20'000 B, input_fee <= MAX_MONEY.
         const int n_input_bytes{fuzzed_data_provider.ConsumeIntegralInRange<int>(1, 20'000)};
         const CAmount input_fee = coin_params.m_effective_feerate.GetFee(n_input_bytes);
diff --git a/src/wallet/test/fuzz/crypter.cpp b/src/wallet/test/fuzz/crypter.cpp
index 81f8240333e..f0a6a36e8e3 100644
--- a/src/wallet/test/fuzz/crypter.cpp
+++ b/src/wallet/test/fuzz/crypter.cpp
@@ -46,8 +46,7 @@ FUZZ_TARGET(crypter, .init = initialize_crypter)
     if (!random_ckey.IsValid()) return;
     CPubKey pubkey{random_ckey.GetPubKey()};
 
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 100)
-    {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 100) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -64,7 +63,7 @@ FUZZ_TARGET(crypter, .init = initialize_crypter)
                 (void)crypt.Decrypt(cipher_text_ed, plain_text_ed);
             },
             [&] {
-                const CKeyingMaterial master_key(random_key.begin(), random_key.end());;
+                const CKeyingMaterial master_key(random_key.begin(), random_key.end());
                 (void)EncryptSecret(master_key, plain_text_ed, pubkey.GetHash(), cipher_text_ed);
             },
             [&] {
diff --git a/src/wallet/test/fuzz/scriptpubkeyman.cpp b/src/wallet/test/fuzz/scriptpubkeyman.cpp
index fb3ea004c4c..32ba797f957 100644
--- a/src/wallet/test/fuzz/scriptpubkeyman.cpp
+++ b/src/wallet/test/fuzz/scriptpubkeyman.cpp
@@ -123,7 +123,7 @@ FUZZ_TARGET(scriptpubkeyman, .init = initialize_spkm)
     }
 
     bool good_data{true};
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 20) {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 20) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
@@ -234,7 +234,7 @@ FUZZ_TARGET(spkm_migration, .init = initialize_spkm_migration)
     auto& legacy_data{*wallet.GetOrCreateLegacyDataSPKM()};
 
     std::vector<CKey> keys;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 30) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 30) {
         const auto key{ConsumePrivateKey(fuzzed_data_provider)};
         if (!key.IsValid()) return;
         auto pub_key{key.GetPubKey()};
@@ -276,7 +276,7 @@ FUZZ_TARGET(spkm_migration, .init = initialize_spkm_migration)
 
     size_t added_script{0};
     bool good_data{true};
-    LIMITED_WHILE(good_data && fuzzed_data_provider.ConsumeBool(), 30) {
+    LIMITED_WHILE (good_data && fuzzed_data_provider.ConsumeBool(), 30) {
         CallOneOf(
             fuzzed_data_provider,
             [&] {
diff --git a/src/wallet/test/fuzz/spend.cpp b/src/wallet/test/fuzz/spend.cpp
index 56ddaa9cb75..f60f4573e39 100644
--- a/src/wallet/test/fuzz/spend.cpp
+++ b/src/wallet/test/fuzz/spend.cpp
@@ -59,8 +59,7 @@ FUZZ_TARGET(wallet_create_transaction, .init = initialize_setup)
 
     int next_locktime{0};
     CAmount all_values{0};
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 10000)
-    {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 10000) {
         CMutableTransaction tx;
         tx.nLockTime = next_locktime++;
         tx.vout.resize(1);
@@ -76,7 +75,7 @@ FUZZ_TARGET(wallet_create_transaction, .init = initialize_setup)
     }
 
     std::vector<CRecipient> recipients;
-    LIMITED_WHILE(fuzzed_data_provider.ConsumeBool(), 100) {
+    LIMITED_WHILE (fuzzed_data_provider.ConsumeBool(), 100) {
         CTxDestination destination;
         CallOneOf(
             fuzzed_data_provider,