Skip to content

Commit

Permalink
[net] remove CConnman::MarkAddressGood
Browse files Browse the repository at this point in the history
It just forwards calls to CAddrMan::Good.
  • Loading branch information
jnewbery committed Mar 20, 2021
1 parent 8073673 commit bcd7f30
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 14 deletions.
5 changes: 0 additions & 5 deletions src/net.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,6 @@ class CConnman
};

// 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);
/**
Expand Down
2 changes: 1 addition & 1 deletion src/net_processing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions src/test/fuzz/connman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,13 @@ 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;
std::string random_string;
while (fuzzed_data_provider.ConsumeBool()) {
CallOneOf(
fuzzed_data_provider,
[&] {
random_address = ConsumeAddress(fuzzed_data_provider);
},
[&] {
random_netaddr = ConsumeNetAddr(fuzzed_data_provider);
},
Expand Down Expand Up @@ -94,9 +90,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());
},
Expand Down

0 comments on commit bcd7f30

Please sign in to comment.