Skip to content

Commit

Permalink
Merge bitcoin#21395: Net processing: Remove unused CNode.address member
Browse files Browse the repository at this point in the history
a6b0fe2 [net processing] Remove unused CNode.address member (John Newbery)

Pull request description:

ACKs for top commit:
  practicalswift:
    cr ACK a6b0fe2: patch looks correct and unused code should be removed
  fanquake:
    ACK a6b0fe2

Tree-SHA512: 6022674dabe79be580d8005ac9e308d444d35588f324a7bb9f1ab04e8ad8ac41355c58ddfb016b001fd80a1a01ebcbddb2919ae9d33faccec2044af88547a79f
  • Loading branch information
MarcoFalke committed Mar 10, 2021
2 parents eea6196 + a6b0fe2 commit 7cdadf9
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions src/net_processing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,6 @@ namespace {
* and we're no longer holding the node's locks.
*/
struct CNodeState {
//! The peer's address
const CService address;
//! The best known block we know this peer has announced.
const CBlockIndex* pindexBestKnownBlock{nullptr};
//! The hash of the last unknown block this peer has announced.
Expand Down Expand Up @@ -582,8 +580,8 @@ struct CNodeState {
//! Whether this peer relays txs via wtxid
bool m_wtxid_relay{false};

CNodeState(CAddress addrIn, bool is_inbound)
: address(addrIn), m_is_inbound(is_inbound)
CNodeState(bool is_inbound)
: m_is_inbound(is_inbound)
{
m_recently_announced_invs.reset();
}
Expand Down Expand Up @@ -920,12 +918,10 @@ void UpdateLastBlockAnnounceTime(NodeId node, int64_t time_in_seconds)

void PeerManagerImpl::InitializeNode(CNode *pnode)
{
CAddress addr = pnode->addr;
std::string addrName = pnode->GetAddrName();
NodeId nodeid = pnode->GetId();
{
LOCK(cs_main);
mapNodeState.emplace_hint(mapNodeState.end(), std::piecewise_construct, std::forward_as_tuple(nodeid), std::forward_as_tuple(addr, pnode->IsInboundConn()));
mapNodeState.emplace_hint(mapNodeState.end(), std::piecewise_construct, std::forward_as_tuple(nodeid), std::forward_as_tuple(pnode->IsInboundConn()));
assert(m_txrequest.Count(nodeid) == 0);
}
{
Expand Down

0 comments on commit 7cdadf9

Please sign in to comment.