Skip to content

Commit 7241b93

Browse files
committed
Merge bitcoin/bitcoin#26965: refactor: Remove stray cs_main redundant declaration
faba08b refactor: Remove stray cs_main redundant declaration (MarcoFalke) fa02591 doc: Export threadsafety.h from sync.h (MarcoFalke) Pull request description: Looks like this was forgotten when introducing kernel/cs_main ? Also, there is a commit to export threadsafety.h from sync.h. ACKs for top commit: hebasto: ACK faba08b Tree-SHA512: 0aa58e7693b6fcd504f9da7339f8baa463a6407f67b27f68002db705f4642321ac3765f16c3d906c925ee24085591b79160a62fa5f4aaf6f2e5dcc788411800d
2 parents 82903a7 + faba08b commit 7241b93

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

ci/test/06_script_b.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ if [ "${RUN_TIDY}" = "true" ]; then
4848
" src/node/chainstate.cpp"\
4949
" src/node/chainstatemanager_args.cpp"\
5050
" src/node/mempool_args.cpp"\
51+
" src/node/utxo_snapshot.cpp"\
5152
" src/node/validation_cache_args.cpp"\
5253
" src/policy/feerate.cpp"\
5354
" src/policy/packages.cpp"\

src/node/utxo_snapshot.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@
77
#include <fs.h>
88
#include <logging.h>
99
#include <streams.h>
10+
#include <sync.h>
11+
#include <tinyformat.h>
12+
#include <txdb.h>
1013
#include <uint256.h>
1114
#include <util/system.h>
1215
#include <validation.h>
1316

17+
#include <cassert>
1418
#include <cstdio>
1519
#include <optional>
20+
#include <string>
1621

1722
namespace node {
1823

src/node/utxo_snapshot.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
#define BITCOIN_NODE_UTXO_SNAPSHOT_H
88

99
#include <fs.h>
10-
#include <uint256.h>
10+
#include <kernel/cs_main.h>
1111
#include <serialize.h>
12-
#include <validation.h>
12+
#include <sync.h>
13+
#include <uint256.h>
1314

15+
#include <cstdint>
1416
#include <optional>
17+
#include <string_view>
1518

16-
extern RecursiveMutex cs_main;
19+
class Chainstate;
1720

1821
namespace node {
1922
//! Metadata describing a serialized version of a UTXO set from which an

src/sync.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <logging/timer.h>
1212
#endif
1313

14-
#include <threadsafety.h>
14+
#include <threadsafety.h> // IWYU pragma: export
1515
#include <util/macros.h>
1616

1717
#include <condition_variable>

0 commit comments

Comments
 (0)