Merge #21487: fuzz: Use ConsumeWeakEnum in addrman for service flags

MarcoFalke · MarcoFalke · commit d400e672a032 · 2021-03-23T09:43:15.000+01:00
5555446 fuzz: Use ConsumeWeakEnum in addrman for service flags (MarcoFalke) Pull request description: This has minimally better performance. Reported by me in bitcoin/bitcoin#20228 (comment) ACKs for top commit: practicalswift: Tested ACK 5555446 vasild: ACK 5555446 Tree-SHA512: 4e5f51fe4f2bd7b2f37d0690e41203341ba45c0c9bc9247449cd26cfb5f77dc2ec61df3e4963276f68694e4b3ca3d0a76367a51c4d775501edeb3224d305a261
diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp
@@ -104,7 +104,7 @@ FUZZ_TARGET_INIT(addrman, initialize_addrman)
             [&] {
                 const std::optional<CService> opt_service = ConsumeDeserializable<CService>(fuzzed_data_provider);
                 if (opt_service) {
-                    addr_man.SetServices(*opt_service, ServiceFlags{fuzzed_data_provider.ConsumeIntegral<uint64_t>()});
+                    addr_man.SetServices(*opt_service, ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS));
                 }
             },
             [&] {

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ FUZZ_TARGET_INIT(addrman, initialize_addrman)`
`104`	`104`	`[&] {`
`105`	`105`	`const std::optional<CService> opt_service = ConsumeDeserializable<CService>(fuzzed_data_provider);`
`106`	`106`	`if (opt_service) {`
`107`		`- addr_man.SetServices(*opt_service, ServiceFlags{fuzzed_data_provider.ConsumeIntegral<uint64_t>()});`
	`107`	`+ addr_man.SetServices(*opt_service, ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS));`
`108`	`108`	`}`
`109`	`109`	`},`
`110`	`110`	`[&] {`