diff options
author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-05-23 19:17:23 +0300 |
---|---|---|
committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-06-14 17:28:30 +0300 |
commit | 06703973c758c2c5d0ff916993aa7055f609d2d7 (patch) | |
tree | df32b02e1f8a96b257a3af912b5b7c0ddf9af978 | |
parent | efc6fac951e75ba913350bb470c3d4e6a4e284b9 (diff) |
Make CAddrMan::Check private
Change in the addrman.h header is move-only.
-rw-r--r-- | src/addrman.h | 26 | ||||
-rw-r--r-- | src/test/fuzz/addrman.cpp | 1 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/addrman.h b/src/addrman.h index 4929fd2ecf..a11dffd048 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -492,19 +492,6 @@ public: return vRandom.size(); } - //! Consistency check - void Check() - { -#ifdef DEBUG_ADDRMAN - { - LOCK(cs); - int err; - if ((err=Check_())) - LogPrintf("ADDRMAN CONSISTENCY CHECK FAILED!!! err=%i\n", err); - } -#endif - } - //! Add a single address. bool Add(const CAddress &addr, const CNetAddr& source, int64_t nTimePenalty = 0) { @@ -725,6 +712,19 @@ private: //! Return a random to-be-evicted tried table address. CAddrInfo SelectTriedCollision_() EXCLUSIVE_LOCKS_REQUIRED(cs); + //! Consistency check + void Check() + { +#ifdef DEBUG_ADDRMAN + { + LOCK(cs); + int err; + if ((err=Check_())) + LogPrintf("ADDRMAN CONSISTENCY CHECK FAILED!!! err=%i\n", err); + } +#endif + } + #ifdef DEBUG_ADDRMAN //! Perform consistency check. Returns an error code or zero. int Check_() EXCLUSIVE_LOCKS_REQUIRED(cs); diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp index b5b402829b..db0b461873 100644 --- a/src/test/fuzz/addrman.cpp +++ b/src/test/fuzz/addrman.cpp @@ -107,7 +107,6 @@ FUZZ_TARGET_INIT(addrman, initialize_addrman) /* max_addresses */ fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 4096), /* max_pct */ fuzzed_data_provider.ConsumeIntegralInRange<size_t>(0, 4096), /* network */ std::nullopt); - (void)/*const_*/addr_man.Check(); (void)/*const_*/addr_man.Select(fuzzed_data_provider.ConsumeBool()); (void)const_addr_man.size(); CDataStream data_stream(SER_NETWORK, PROTOCOL_VERSION); |