mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-12 23:18:14 +01:00
Merge #21391: [Bundle 5/n] Prune g_chainman usage in RPC modules
586190f0b4rpc/rest: Take and reuse local Chain/ChainState obj (Carl Dong)bc3bd36902rpc: style: Improve BuriedForkDescPushBack signature (Carl Dong)f99913969frpc: Remove unnecessary casting of block height (Carl Dong)6a3d192020rpc: Tidy up local references (see commit message) (Carl Dong)038854f31erest/rpc: Remove now-unused old Ensure functions (Carl Dong)6fb65b49f4scripted-diff: rest/rpc: Use renamed EnsureAny*() (Carl Dong)1570c7ee98rpc: Add renamed EnsureAny*() functions (Carl Dong)306b1cd3eerpc: Add alt Ensure* functions acepting NodeContext (Carl Dong)d7824acdb9rest: Use existing NodeContext (Carl Dong)3f08934799rest: Pass in NodeContext to rest_block (Carl Dong)7be0671b95rpc/rawtx: Use existing NodeContext (Carl Dong)60dc05afc6rpc/mining: Use existing NodeContext (Carl Dong)d485e815e2rpc/blockchain: Use existing NodeContext (Carl Dong)d0abf0bf42rpc/*,rest: Add review-only assertion to EnsureChainman (Carl Dong)cced0f46c9miner: Pass in previous CBlockIndex to RegenerateCommitments (Carl Dong) Pull request description: Overall PR: #20158 (tree-wide: De-globalize ChainstateManager) Based on: - [x] #21270 | [Bundle 4/n] Prune g_chainman usage in validation-adjacent modules - [x] #21525 | [Bundle 4.5/n] Followup fixups to bundle 4 Note to reviewers: 1. This bundle may _apparently_ introduce usage of `g_chainman` or `::Chain(state|)Active()` globals, but these are resolved later on in the overall PR. [Commits of overall PR](https://github.com/bitcoin/bitcoin/pull/20158/commits) 2. There may be seemingly obvious local references to `ChainstateManager` or other validation objects which are not being used in callers of the current function in question, this is done intentionally to **_keep each commit centered around one function/method_** to ease review and to make the overall change systematic. We don't assume anything about our callers. Rest assured that once we are considering that particular caller in later commits, we will use the obvious local references. [Commits of overall PR](https://github.com/bitcoin/bitcoin/pull/20158/commits) 3. When changing a function/method that has many callers (e.g. `LookupBlockIndex` with 55 callers), it is sometimes easier (and less error-prone) to use a scripted-diff. When doing so, there will be 3 commits in sequence so that every commit compiles like so: 1. Add `new_function`, make `old_function` a wrapper of `new_function`, divert all calls to `old_function` to `new_function` **in the local module only** 2. Scripted-diff to divert all calls to `old_function` to `new_function` **in the rest of the codebase** 3. Remove `old_function` ACKs for top commit: ryanofsky: Code review ACK586190f0b4. Since last review, no changes to existing commits, just some simple new commits added: three new commits renaming std::any Ensure functions (scripted diff commit and manual pre/post commits), and one new commit factoring out a repeated `ActiveChain()` call made in a loop. Thanks for the updates! jnewbery: utACK586190f0b4MarcoFalke: review ACK586190f0b4🍯 Tree-SHA512: 64b677fb50141805b55c3f1afe68fcd298f9a071a359bdcd63256d52e334f83e462f31fb3ebee9b630da8f1d912a03a128cfc38179e7aaec29a055744a98478c
This commit is contained in:
@@ -242,7 +242,8 @@ CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransa
|
||||
for (const CMutableTransaction& tx : txns) {
|
||||
block.vtx.push_back(MakeTransactionRef(tx));
|
||||
}
|
||||
RegenerateCommitments(block, WITH_LOCK(::cs_main, return std::ref(g_chainman.m_blockman)));
|
||||
CBlockIndex* prev_block = WITH_LOCK(::cs_main, return g_chainman.m_blockman.LookupBlockIndex(block.hashPrevBlock));
|
||||
RegenerateCommitments(block, prev_block);
|
||||
|
||||
while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user