aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2020-10-23 10:20:48 +0100
committerJohn Newbery <john@johnnewbery.com>2021-03-20 10:24:40 +0000
commitbcd7f30b7944892db7ae37069175804567bb0cdf (patch)
tree78d3a15c0ebd5523701ab2edd4022217f41df6fb
parent8073673dbcb2744fcc9c011edf2d61388ca929cd (diff)
downloadbitcoin-bcd7f30b7944892db7ae37069175804567bb0cdf.tar.xz
[net] remove CConnman::MarkAddressGood
It just forwards calls to CAddrMan::Good.
-rw-r--r--src/net.cpp5
-rw-r--r--src/net.h1
-rw-r--r--src/net_processing.cpp2
-rw-r--r--src/test/fuzz/connman.cpp7
4 files changed, 1 insertions, 14 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 27c64a737e..0e5909612e 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -2635,11 +2635,6 @@ CConnman::~CConnman()
Stop();
}
-void CConnman::MarkAddressGood(const CAddress& addr)
-{
- addrman.Good(addr);
-}
-
bool CConnman::AddNewAddresses(const std::vector<CAddress>& vAddr, const CAddress& addrFrom, int64_t nTimePenalty)
{
return addrman.Add(vAddr, addrFrom, nTimePenalty);
diff --git a/src/net.h b/src/net.h
index 0e4790a226..f2add667d2 100644
--- a/src/net.h
+++ b/src/net.h
@@ -921,7 +921,6 @@ public:
};
// Addrman functions
- void MarkAddressGood(const CAddress& addr);
bool AddNewAddresses(const std::vector<CAddress>& vAddr, const CAddress& addrFrom, int64_t nTimePenalty = 0);
std::vector<CAddress> GetAddresses(size_t max_addresses, size_t max_pct);
/**
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 6942f02a18..ff1e46eb67 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2476,7 +2476,7 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
//
// This moves an address from New to Tried table in Addrman,
// resolves tried-table collisions, etc.
- m_connman.MarkAddressGood(pfrom.addr);
+ m_addrman.Good(pfrom.addr);
}
std::string remoteAddr;
diff --git a/src/test/fuzz/connman.cpp b/src/test/fuzz/connman.cpp
index 4c4da24262..dec580ea22 100644
--- a/src/test/fuzz/connman.cpp
+++ b/src/test/fuzz/connman.cpp
@@ -27,7 +27,6 @@ FUZZ_TARGET_INIT(connman, initialize_connman)
SetMockTime(ConsumeTime(fuzzed_data_provider));
CAddrMan addrman;
CConnman connman{fuzzed_data_provider.ConsumeIntegral<uint64_t>(), fuzzed_data_provider.ConsumeIntegral<uint64_t>(), addrman, fuzzed_data_provider.ConsumeBool()};
- CAddress random_address;
CNetAddr random_netaddr;
CNode random_node = ConsumeNode(fuzzed_data_provider);
CSubNet random_subnet;
@@ -36,9 +35,6 @@ FUZZ_TARGET_INIT(connman, initialize_connman)
CallOneOf(
fuzzed_data_provider,
[&] {
- random_address = ConsumeAddress(fuzzed_data_provider);
- },
- [&] {
random_netaddr = ConsumeNetAddr(fuzzed_data_provider);
},
[&] {
@@ -95,9 +91,6 @@ FUZZ_TARGET_INIT(connman, initialize_connman)
(void)connman.GetNodeCount(fuzzed_data_provider.PickValueInArray({ConnectionDirection::None, ConnectionDirection::In, ConnectionDirection::Out, ConnectionDirection::Both}));
},
[&] {
- connman.MarkAddressGood(random_address);
- },
- [&] {
(void)connman.OutboundTargetReached(fuzzed_data_provider.ConsumeBool());
},
[&] {