diff options
| author | fanquake <fanquake@gmail.com> | 2021-07-21 11:37:19 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-07-21 12:32:44 +0800 |
| commit | 0fffd6c4fb35831d98a8b57b1e73cec142cb31fe (patch) | |
| tree | 394125a0b3ee8982afaaaa5cbfb5271662de9303 | |
| parent | bb09ec6f106c40b4935b6b13eb1a455e588c00ac (diff) | |
| parent | f036dfbb692c4d44d0f59194d089ed0aa1096347 (diff) | |
Merge bitcoin/bitcoin#22505: addrman: Remove unused test_before_evict argument from Good()
f036dfbb692c4d44d0f59194d089ed0aa1096347 [addrman] Remove unused test_before_evict argument from Good() (John Newbery)
Pull request description:
This has never been used in the public interface method since it was
introduced in #9037.
ACKs for top commit:
lsilva01:
Tested ACK https://github.com/bitcoin/bitcoin/pull/22505/commits/f036dfbb692c4d44d0f59194d089ed0aa1096347 on Ubuntu 20.04.
theStack:
Code-review ACK f036dfbb692c4d44d0f59194d089ed0aa1096347
Tree-SHA512: 98145d9596b4ae1f354cfa561be1a54c6b8057c920e0ac3d4c1d42c9326b2dad2d44320f4171bb701d97088b216760cca8017b84c8b5dcd2b1dc8f158f28066d
| -rw-r--r-- | src/addrman.h | 4 | ||||
| -rw-r--r-- | src/test/addrman_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/fuzz/addrman.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/addrman.h b/src/addrman.h index 6f081b8dc1..1fc64ac07f 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -536,12 +536,12 @@ public: } //! Mark an entry as accessible. - void Good(const CService &addr, bool test_before_evict = true, int64_t nTime = GetAdjustedTime()) + void Good(const CService &addr, int64_t nTime = GetAdjustedTime()) EXCLUSIVE_LOCKS_REQUIRED(!cs) { LOCK(cs); Check(); - Good_(addr, test_before_evict, nTime); + Good_(addr, /* test_before_evict */ true, nTime); Check(); } diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp index 1103292c1a..5e5c5eba69 100644 --- a/src/test/addrman_tests.cpp +++ b/src/test/addrman_tests.cpp @@ -76,7 +76,7 @@ public: { int64_t nLastSuccess = 1; // Set last good connection in the deep past. - Good(addr, true, nLastSuccess); + Good(addr, nLastSuccess); bool count_failure = false; int64_t nLastTry = GetAdjustedTime()-61; diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp index db0b461873..8513f1e6df 100644 --- a/src/test/fuzz/addrman.cpp +++ b/src/test/fuzz/addrman.cpp @@ -80,7 +80,7 @@ FUZZ_TARGET_INIT(addrman, initialize_addrman) [&] { const std::optional<CService> opt_service = ConsumeDeserializable<CService>(fuzzed_data_provider); if (opt_service) { - addr_man.Good(*opt_service, fuzzed_data_provider.ConsumeBool(), ConsumeTime(fuzzed_data_provider)); + addr_man.Good(*opt_service, ConsumeTime(fuzzed_data_provider)); } }, [&] { |