Page MenuHomePhabricator
Differential D12174

[refactor] pass coinsview and height to check()
ClosedPublic
Actions

Authored by PiRK on Oct 7 2022, 09:28.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABCc8b5a158b441: [refactor] pass coinsview and height to check()
Summary

Removes check's dependency on validation.h. This is a step towards removing the txmempool --> validation circular dependency.

From the PR's description:

There are two functions in txmempool that need validation right now: check() and removeForReorg(). This PR removes the dependencies in check().

This concludes backport of core#23157 [8/8]
https://github.com/bitcoin/bitcoin/pull/23157/commits/082c5bf099c64e3d27abe9b68a71ce500b693e7e#diff-6875de769e90cec84d2e8a9c1b962cdbcda44d870d42e4215827e599e11e90e3

Depends on D12173

The fuzzer change is not applicable due to missing backports.

Test Plan

ninja all check-all bench-bitcoin

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

PiRK created this revision.Oct 7 2022, 09:28
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 7 2022, 09:28
PiRK requested review of this revision.Oct 7 2022, 09:28
teamcity edited the summary of this revision. (Show Details)Oct 7 2022, 09:29
Harbormaster completed remote builds in B20397: Diff 35513.Oct 7 2022, 10:00
Fabien accepted this revision.Oct 7 2022, 10:22
Fabien added a subscriber: Fabien.
Fabien added inline comments.
src/validation.cpp
2834 ↗(On Diff #35513)

We are missing a check if (m_mempool) here, can you check what backport is missing ?

This revision is now accepted and ready to land.Oct 7 2022, 10:22
PiRK added inline comments.Oct 7 2022, 10:38
src/validation.cpp
2834 ↗(On Diff #35513)

https://github.com/bitcoin/bitcoin/pull/22415
Make m_mempool optional in CChainState

Closed by commit rABCc8b5a158b441: [refactor] pass coinsview and height to check() (authored by glozow <gloriajzhao@gmail.com>, committed by PiRK). · Explain WhyOct 7 2022, 13:39
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABCc8b5a158b441: [refactor] pass coinsview and height to check().

Revision Contents
Changeset List

PathSize
src/
bench/
4 lines
8 lines
4 lines
5 lines
2 lines

Diff 35527

View Options

src/bench/mempool_stress.cpp

Loading...
View Options

src/net_processing.cpp

Loading...
View Options

src/txmempool.h

Loading...
View Options

src/txmempool.cpp

Loading...
View Options

src/validation.cpp

Loading...