diff options
| author | fanquake <fanquake@gmail.com> | 2021-09-10 13:50:00 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-09-10 14:04:16 +0800 |
| commit | 5446070418c1a3540d32c95831b9d1aefe8d6755 (patch) | |
| tree | de5ac3dd17f05dd3913ff6f551fd7a71fd33136b /src/addrman.h | |
| parent | b65341555c14da3e8f907d0265eba1c4a3b2472b (diff) | |
| parent | 853c4edb70f897a6a7165abaea4a303d7d448721 (diff) | |
| download | bitcoin-5446070418c1a3540d32c95831b9d1aefe8d6755.tar.xz | |
Merge bitcoin/bitcoin#22911: [net] Minor cleanups to asmap
853c4edb70f897a6a7165abaea4a303d7d448721 [net] Remove asmap argument from CNode::CopyStats() (John Newbery)
9fd5618610e91e3949536c5122cf31eb58c9aa6b [asmap] Make DecodeAsmap() a utility function (John Newbery)
bfdf4ef334a16ef6108a658bf4f8514754128c18 [asmap] Remove SanityCheckASMap() from netaddress (John Newbery)
07a9eccb60485e71494664cc2b1964ae06a3dcf0 [net] Remove CConnman::Options.m_asmap (John Newbery)
Pull request description:
These small cleanups to the asmap code are the first 4 commits from #22910. They're minor improvements that are independently useful whether or not 22910 is merged.
ACKs for top commit:
naumenkogs:
ACK 853c4edb70f897a6a7165abaea4a303d7d448721
theStack:
Concept and code-review ACK 853c4edb70f897a6a7165abaea4a303d7d448721 🗺️
fanquake:
ACK 853c4edb70f897a6a7165abaea4a303d7d448721
Tree-SHA512: 64783743182592ac165df6ff8d18870b63861e9204ed722c207fca6938687aac43232a5ac4d8228cf8b92130ab0349de1b410a2467bb5a9d60dd9a7221b3b85b
Diffstat (limited to 'src/addrman.h')
| -rw-r--r-- | src/addrman.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/addrman.h b/src/addrman.h index 14cc113f94..0885231ebc 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -142,9 +142,6 @@ static constexpr int ADDRMAN_BUCKET_SIZE{1 << ADDRMAN_BUCKET_SIZE_LOG2}; class CAddrMan { public: - // Read asmap from provided binary file - static std::vector<bool> DecodeAsmap(fs::path path); - template <typename Stream> void Serialize(Stream& s_) const EXCLUSIVE_LOCKS_REQUIRED(!cs); |