Page MenuHomePhabricator
Differential D11587

rpc: Tidy up local references (see commit message)
ClosedPublic
Actions

Authored by PiRK on Jun 8 2022, 15:27.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC77cb6d193123: rpc: Tidy up local references (see commit message)
Summary

Organize local variables/references such that:

  1. There is always a ChainstateManager reference before any LOCK(cs_main).
  2. NodeContext references are used with Ensure*() functions introduced in previous commit where appropriate to avoid duplicate assertions.

This is a backport of core#21391 [12/14]
https://github.com/bitcoin/bitcoin/pull/21391/commits/6a3d1920209cded0dae52fb9070a3530d9a4e5fd

Depends on D11586

Test Plan

With clang and debug:
ninja all check-all

Diff Detail

Event Timeline

PiRK created this revision.Jun 8 2022, 15:27
Herald added a reviewer: Restricted Project. · View Herald TranscriptJun 8 2022, 15:27
PiRK requested review of this revision.Jun 8 2022, 15:27
teamcity edited the summary of this revision. (Show Details)Jun 8 2022, 15:27
PiRK added a child revision: D11588: rpc: Remove unnecessary casting of block height.Jun 8 2022, 15:30
Harbormaster completed remote builds in B19307: Diff 33896.Jun 8 2022, 15:54
Fabien mentioned this in D11584: rest: Pass in NodeContext to rest_block and use it.Jun 9 2022, 14:59
Fabien requested changes to this revision.Jun 9 2022, 15:09
Fabien added a subscriber: Fabien.
Fabien added inline comments.
src/rpc/blockchain.cpp
1652 ↗(On Diff #33896)

This doesn't need the lock either

src/rpc/rawtransaction.cpp
1166 ↗(On Diff #33896)

Use the WITH_LOCK macro to avoid nesting

This revision now requires changes to proceed.Jun 9 2022, 15:09
PiRK updated this revision to Diff 33920.Jun 9 2022, 15:39

use WITH_LOCK macro, move config.GetChainParams() before the lock

Harbormaster completed remote builds in B19321: Diff 33920.Jun 9 2022, 15:55
Fabien accepted this revision.Jun 9 2022, 16:15
This revision is now accepted and ready to land.Jun 9 2022, 16:15
Closed by commit rABC77cb6d193123: rpc: Tidy up local references (see commit message) (authored by Carl Dong <contact@carldong.me>, committed by PiRK). · Explain WhyJun 9 2022, 16:20
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABC77cb6d193123: rpc: Tidy up local references (see commit message).

Revision Contents
Changeset List

PathSize
src/
4 lines
rpc/
59 lines
33 lines
44 lines

Diff 33920

View Options

src/rest.cpp

Loading...
View Options

src/rpc/blockchain.cpp

Loading...
View Options

src/rpc/mining.cpp

Loading...
View Options

src/rpc/rawtransaction.cpp

Loading...