Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Apr 8, 2022

This commit partially reverts 923312f.

Portion of #24294.

@fanquake fanquake added this to the 23.0 milestone Apr 8, 2022
fanquake pushed a commit to fanquake/bitcoin that referenced this pull request Apr 8, 2022
@maflcko
Copy link
Member

maflcko commented Apr 8, 2022

Running locally to confirm this was the only occurrence:

$ git grep '"block_hash"' src/
src/rpc/blockchain.cpp:            {"block_hash", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The block hash to try to fetch"},
src/rpc/blockchain.cpp:    const uint256& block_hash{ParseHashV(request.params[0], "block_hash")};

review ACK 88917f9

Didn't run tests to see if they use a named arg anywhere.

@ajtowns
Copy link
Contributor

ajtowns commented Apr 8, 2022

ACK 88917f9

Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review-and-grep-only ACK 88917f9

@fanquake fanquake merged commit e0680bb into bitcoin:master Apr 8, 2022
@fanquake fanquake deleted the use_bloch_hash branch April 8, 2022 12:43
@fanquake
Copy link
Member Author

fanquake commented Apr 8, 2022

Backported in #24807.

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 8, 2022
…ram name blockhash

88917f9 RPC: Switch getblockfrompeer back to standard param name blockhash (Luke Dashjr)

Pull request description:

  This commit partially reverts 923312f.

  Portion of bitcoin#24294.

ACKs for top commit:
  MarcoFalke:
    review ACK 88917f9
  ajtowns:
    ACK 88917f9
  jonatack:
    Review-and-grep-only ACK 88917f9

Tree-SHA512: e42497ea6162623e449c5e60b83a5abbef568f226edc022aa14bbc1f1921618255d593968cf43f7a6d2c0bfd84cdd4b05fbce5c724759b20035e6eead758d443
laanwj added a commit that referenced this pull request Apr 8, 2022
e3e4be9 RPC: Switch getblockfrompeer back to standard param name blockhash (Luke Dashjr)
69cc83d Add DEBUG_LOCKCONTENTION documentation to the developer notes (Jon Atack)
6374e24 Put lock logging behind DEBUG_LOCKCONTENTION preprocessor directive (Jon Atack)

Pull request description:

  Backports:
  * #24770
  * #24806

ACKs for top commit:
  laanwj:
    Commit list and code review ACK e3e4be9
  jonatack:
    Code review and commit metadata ACK e3e4be9

Tree-SHA512: eff2b506379a9396b12b42ed2858e3eb9403a55950d6dec0b5dcc95c4c2998cddf9e0ec88af2f8ac5a7bece4d4537acede1c75f59bbc6616bee273384f87f6b0
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Dec 3, 2022
Summary:
This concludes backport of [[bitcoin/bitcoin#23706 | core#23706]] and [[bitcoin/bitcoin#24806 | core#24806]]
bitcoin/bitcoin@923312f

Depends on D12720

Test Plan: `ninja all check-all`

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Subscribers: Fabien

Differential Revision: https://reviews.bitcoinabc.org/D12721
@bitcoin bitcoin locked and limited conversation to collaborators Apr 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants