diff options
| author | fanquake <fanquake@gmail.com> | 2021-08-17 09:27:24 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-08-17 10:05:03 +0800 |
| commit | f3dbd1c2b2bc2b8edae657f79a2d31820b428e86 (patch) | |
| tree | 70c8aa0ba048ea681bd8cd563b2b2456e91cf1f7 /src/test/fuzz | |
| parent | df30375788efc9ddbf0fd456307568600e7f6a04 (diff) | |
| parent | 60e0cbdd574bb9109bcad1e0c27c7936a534a0e7 (diff) | |
Merge bitcoin/bitcoin#22627: [addrman] De-duplicate Add() function
60e0cbdd574bb9109bcad1e0c27c7936a534a0e7 [addrman] Merge the two Add() functions (Amiti Uttarwar)
Pull request description:
This PR merges the two definitions of this overloaded function to reduce code duplication.
When these functions were introduced in https://github.com/bitcoin/bitcoin/commit/5fee401fe14aa6459428a26a82f764db70a6a0b9, there were multiple places that invoked `Add()` with a single addr and a vector of addrs each, so it made sense to overload the function. I could see how the small difference in log statement was more meaningful when a peer was added via IRC :)
Now, the definition of `Add()` that takes in a single address is only invoked from the hidden/test-only RPC `addpeeraddress`. These changes should not cause any observable difference, and are covered by the existing tests that use this RPC endpoint.
ACKs for top commit:
jnewbery:
Code review ACK 60e0cbdd574bb9109bcad1e0c27c7936a534a0e7
Zero-1729:
crACK 60e0cbd
fanquake:
ACK 60e0cbdd574bb9109bcad1e0c27c7936a534a0e7
Tree-SHA512: 782fb2ac6d2d403ba7d7ff543197ca42b610b9a8806952d271e57e2ee3527ad1a94af4ebbad5371b5e95d77df07c56ccc8c1d5a2c82cdecb0d2b5085b3bdd5ee
Diffstat (limited to 'src/test/fuzz')
| -rw-r--r-- | src/test/fuzz/addrman.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp index 60fba5730a..bc41180a8f 100644 --- a/src/test/fuzz/addrman.cpp +++ b/src/test/fuzz/addrman.cpp @@ -253,13 +253,6 @@ FUZZ_TARGET_INIT(addrman, initialize_addrman) (void)addr_man.SelectTriedCollision(); }, [&] { - const std::optional<CAddress> opt_address = ConsumeDeserializable<CAddress>(fuzzed_data_provider); - const std::optional<CNetAddr> opt_net_addr = ConsumeDeserializable<CNetAddr>(fuzzed_data_provider); - if (opt_address && opt_net_addr) { - addr_man.Add(*opt_address, *opt_net_addr, fuzzed_data_provider.ConsumeIntegralInRange<int64_t>(0, 100000000)); - } - }, - [&] { std::vector<CAddress> addresses; while (fuzzed_data_provider.ConsumeBool()) { const std::optional<CAddress> opt_address = ConsumeDeserializable<CAddress>(fuzzed_data_provider); |