Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: bitcoin#19698, #20079, #20566, #20715, #20868, #21012, #21188, #21200, #21205, #21211, #21293 #6069

Merged
merged 11 commits into from
Jun 21, 2024
Merged

backport: bitcoin#19698, #20079, #20566, #20715, #20868, #21012, #21188, #21200, #21205, #21211, #21293 #6069

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
147d391
Merge #20566: refactor: Use C++17 std::array where possible
Dec 4, 2020
785f731
Merge #20079: p2p: Treat handshake misbehavior like unknown message
Dec 12, 2020
e5249fb
Merge #21012: ci: Fuzz with integer sanitizer
Jan 29, 2021
292861a
Merge #20868: validation: remove redundant check on pindex
Feb 1, 2021
5ec99ff
Merge #20715: util: Add ArgsManager::GetCommand() and use it in bitco…
Feb 4, 2021
e3e6929
Merge #21188: scripted-diff: Remove redundant lock annotations in net…
Feb 17, 2021
91e0359
Merge #21205: build: actually fail when Boost is missing
fanquake Feb 19, 2021
259a767
Merge #21211: test: Move P2WSH_OP_TRUE to shared test library
Feb 19, 2021
5a77c02
Merge #19698: test: apply strict verification flags for transaction t…
laanwj Feb 23, 2021
4ab6aa4
Merge #21293: test: Replace accidentally placed bit-OR with logical-OR
laanwj Feb 24, 2021
4e81732
Merge #21200: test: Speed up rpc_blockchain.py by removing miniwallet…
laanwj Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge bitcoin#21188: scripted-diff: Remove redundant lock annotations… 
… in net processing

fafddfa scripted-diff: Remove shadowing lock annotations (MarcoFalke)

Pull request description:

  Would be good to not redundantly copy the lock annotation from the class declaration to the member implementation. Otherwise it may not result in a compile failure if a new lock requirement is added to the member implementation, but not the class declaration.

ACKs for top commit:
  amitiuttarwar:
    ACK `fafddfadda`, confirmed that the annotations removed were all redundant. confirmed the claim of potential issue :)
  hebasto:
    ACK fafddfa
  jonatack:
    Light utACK fafddfa verified that the removed annotations in the definitions correspond to those in their respective declarations

Tree-SHA512: ea095c6d4e0bedd70d4e2d8a42b06cfd90c161ebfcaac13558c5dc065601a732e5f812f332104b7daa087aa57b8b0242b177799d22eef7628d77d4d87f443bf2
  • Loading branch information
@knst
MarcoFalke authored and knst committed Jun 20, 2024
commit e3e69290a20c784880a6be69f8060ed9302c0b48
2 changes: 1 addition & 1 deletion src/net_processing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2500,7 +2500,7 @@ void PeerManagerImpl::ProcessGetBlockData(CNode& pfrom, Peer& peer, const CInv&
}

//! Determine whether or not a peer can request a transaction, and return it (or nullptr if not found or not allowed).
CTransactionRef PeerManagerImpl::FindTxForGetData(const CNode* peer, const uint256& txid, const std::chrono::seconds mempool_req, const std::chrono::seconds now) LOCKS_EXCLUDED(cs_main)
CTransactionRef PeerManagerImpl::FindTxForGetData(const CNode* peer, const uint256& txid, const std::chrono::seconds mempool_req, const std::chrono::seconds now)
{
auto txinfo = m_mempool.info(txid);
if (txinfo.tx) {
Expand Down