From 430e183b89d00b4148f0b77a6fcacca2cd948202 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Thu, 30 Jul 2020 11:01:11 +0100 Subject: [PATCH] [net processing] Remove mempool argument from AlreadyHaveBlock() --- src/net_processing.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 3a0613deeb..3fb8907b5e 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -1451,7 +1451,7 @@ bool static AlreadyHaveTx(const CInv& inv, const CTxMemPool& mempool) EXCLUSIVE_ return recentRejects->contains(inv.hash) || mempool.exists(ToGenTxid(inv)); } -bool static AlreadyHaveBlock(const CInv& inv, const CTxMemPool& mempool) EXCLUSIVE_LOCKS_REQUIRED(cs_main) +bool static AlreadyHaveBlock(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main) { return LookupBlockIndex(inv.hash) != nullptr; } @@ -2662,7 +2662,7 @@ void PeerLogicValidation::ProcessMessage(CNode& pfrom, const std::string& msg_ty } if (inv.type == MSG_BLOCK) { - bool fAlreadyHave = AlreadyHaveBlock(inv, m_mempool); + bool fAlreadyHave = AlreadyHaveBlock(inv); LogPrint(BCLog::NET, "got inv: %s %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom.GetId()); UpdateBlockAvailability(pfrom.GetId(), inv.hash);