fuzz: [refactor] Use PickValue where possible

MarcoFalke · MarcoFalke · commit fa818ca202cb · 2021-03-24T06:57:55.000+01:00
diff --git a/src/test/fuzz/pow.cpp b/src/test/fuzz/pow.cpp
@@ -34,7 +34,7 @@ FUZZ_TARGET_INIT(pow, initialize_pow)
         }
         CBlockIndex current_block{*block_header};
         {
-            CBlockIndex* previous_block = !blocks.empty() ? &blocks[fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, blocks.size() - 1)] : nullptr;
+            CBlockIndex* previous_block = blocks.empty() ? nullptr : &PickValue(fuzzed_data_provider, blocks);
             const int current_height = (previous_block != nullptr && previous_block->nHeight != std::numeric_limits<int>::max()) ? previous_block->nHeight + 1 : 0;
             if (fuzzed_data_provider.ConsumeBool()) {
                 current_block.pprev = previous_block;
@@ -66,9 +66,9 @@ FUZZ_TARGET_INIT(pow, initialize_pow)
             }
         }
         {
-            const CBlockIndex* to = &blocks[fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, blocks.size() - 1)];
-            const CBlockIndex* from = &blocks[fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, blocks.size() - 1)];
-            const CBlockIndex* tip = &blocks[fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, blocks.size() - 1)];
+            const CBlockIndex* to = &PickValue(fuzzed_data_provider, blocks);
+            const CBlockIndex* from = &PickValue(fuzzed_data_provider, blocks);
+            const CBlockIndex* tip = &PickValue(fuzzed_data_provider, blocks);
             try {
                 (void)GetBlockProofEquivalentTime(*to, *from, *tip, consensus_params);
             } catch (const uint_error&) {
diff --git a/src/test/fuzz/process_messages.cpp b/src/test/fuzz/process_messages.cpp
@@ -65,7 +65,7 @@ FUZZ_TARGET_INIT(process_messages, initialize_process_messages)
         net_msg.m_type = random_message_type;
         net_msg.data = ConsumeRandomLengthByteVector(fuzzed_data_provider);
 
-        CNode& random_node = *peers.at(fuzzed_data_provider.ConsumeIntegralInRange<int>(0, peers.size() - 1));
+        CNode& random_node = *PickValue(fuzzed_data_provider, peers);
 
         (void)connman.ReceiveMsgFrom(random_node, net_msg);
         random_node.fPauseSend = false;
diff --git a/src/test/fuzz/util.h b/src/test/fuzz/util.h
@@ -49,7 +49,7 @@ void CallOneOf(FuzzedDataProvider& fuzzed_data_provider, Callables... callables)
 }
 
 template <typename Collection>
-const auto& PickValue(FuzzedDataProvider& fuzzed_data_provider, const Collection& col)
+auto& PickValue(FuzzedDataProvider& fuzzed_data_provider, Collection& col)
 {
     const auto sz = col.size();
     assert(sz >= 1);

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ FUZZ_TARGET_INIT(pow, initialize_pow)`
`34`	`34`	`}`
`35`	`35`	`CBlockIndex current_block{*block_header};`
`36`	`36`	`{`
`37`		`- CBlockIndex* previous_block = !blocks.empty() ? &blocks[fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, blocks.size() - 1)] : nullptr;`
	`37`	`+ CBlockIndex* previous_block = blocks.empty() ? nullptr : &PickValue(fuzzed_data_provider, blocks);`
`38`	`38`	`const int current_height = (previous_block != nullptr && previous_block->nHeight != std::numeric_limits<int>::max()) ? previous_block->nHeight + 1 : 0;`
`39`	`39`	`if (fuzzed_data_provider.ConsumeBool()) {`
`40`	`40`	`current_block.pprev = previous_block;`
`@@ -66,9 +66,9 @@ FUZZ_TARGET_INIT(pow, initialize_pow)`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`{`
`69`		`- const CBlockIndex* to = &blocks[fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, blocks.size() - 1)];`
`70`		`- const CBlockIndex* from = &blocks[fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, blocks.size() - 1)];`
`71`		`- const CBlockIndex* tip = &blocks[fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, blocks.size() - 1)];`
	`69`	`+ const CBlockIndex* to = &PickValue(fuzzed_data_provider, blocks);`
	`70`	`+ const CBlockIndex* from = &PickValue(fuzzed_data_provider, blocks);`
	`71`	`+ const CBlockIndex* tip = &PickValue(fuzzed_data_provider, blocks);`
`72`	`72`	`try {`
`73`	`73`	`(void)GetBlockProofEquivalentTime(to, from, *tip, consensus_params);`
`74`	`74`	`} catch (const uint_error&) {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void CallOneOf(FuzzedDataProvider& fuzzed_data_provider, Callables... callables)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`template <typename Collection>`
`52`		`-const auto& PickValue(FuzzedDataProvider& fuzzed_data_provider, const Collection& col)`
	`52`	`+auto& PickValue(FuzzedDataProvider& fuzzed_data_provider, Collection& col)`
`53`	`53`	`{`
`54`	`54`	`const auto sz = col.size();`
`55`	`55`	`assert(sz >= 1);`