From fa9ca13f35be0a023aeed78775ad66f95717b28b Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Tue, 3 Jun 2025 19:51:23 +0200 Subject: [PATCH] refactor: Sort includes of touched source files --- src/bench/parse_hex.cpp | 5 +++-- src/bip324.cpp | 2 +- src/cluster_linearize.h | 4 ++-- src/common/args.h | 2 +- src/consensus/consensus.h | 2 +- src/crypto/chacha20.h | 2 +- src/crypto/chacha20poly1305.cpp | 2 +- src/crypto/hkdf_sha256_32.h | 2 +- src/crypto/hmac_sha256.h | 2 +- src/crypto/hmac_sha512.h | 2 +- src/crypto/poly1305.h | 2 +- src/crypto/ripemd160.h | 2 +- src/crypto/sha1.h | 2 +- src/crypto/sha256.h | 2 +- src/crypto/sha256_sse4.cpp | 2 +- src/crypto/sha3.h | 2 +- src/crypto/sha512.h | 2 +- src/interfaces/node.h | 4 ++-- src/kernel/mempool_entry.h | 4 ++-- src/netbase.h | 2 +- src/node/connection_types.h | 2 +- src/node/miner.h | 2 +- src/node/mini_miner.h | 2 +- src/rpc/client.cpp | 2 +- src/rpc/mining.cpp | 2 +- src/rpc/rawtransaction.cpp | 2 +- src/rpc/server.h | 2 +- src/streams.h | 4 ++-- src/test/fuzz/addrman.cpp | 2 +- src/test/fuzz/cluster_linearize.cpp | 4 ++-- src/test/fuzz/coinscache_sim.cpp | 6 +++--- src/test/fuzz/deserialize.cpp | 2 +- src/test/fuzz/txgraph.cpp | 6 +++--- src/test/fuzz/vecdeque.cpp | 2 +- src/test/scriptnum10.h | 2 +- src/test/util/cluster_linearize.h | 2 +- src/txgraph.h | 4 ++-- src/util/feefrac.h | 7 ++++--- src/validation.h | 2 +- src/wallet/sqlite.cpp | 4 ++-- src/wallet/test/wallet_tests.cpp | 2 +- src/wallet/walletdb.h | 2 +- 42 files changed, 58 insertions(+), 56 deletions(-) diff --git a/src/bench/parse_hex.cpp b/src/bench/parse_hex.cpp index c20e9546c34..fa08f5d84a1 100644 --- a/src/bench/parse_hex.cpp +++ b/src/bench/parse_hex.cpp @@ -1,12 +1,13 @@ -// Copyright (c) 2024- The Bitcoin Core developers +// Copyright (c) 2024-present The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include #include -#include #include + #include +#include #include #include diff --git a/src/bip324.cpp b/src/bip324.cpp index bb1fae5dee4..9c5a1572bb7 100644 --- a/src/bip324.cpp +++ b/src/bip324.cpp @@ -17,8 +17,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/cluster_linearize.h b/src/cluster_linearize.h index 2a3c649576f..17b7e6b27a0 100644 --- a/src/cluster_linearize.h +++ b/src/cluster_linearize.h @@ -6,11 +6,11 @@ #define BITCOIN_CLUSTER_LINEARIZE_H #include +#include #include #include -#include -#include #include +#include #include #include diff --git a/src/common/args.h b/src/common/args.h index c35e2cb88a7..6c5ac48ae3e 100644 --- a/src/common/args.h +++ b/src/common/args.h @@ -11,12 +11,12 @@ #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index 1e5a6bc4c3c..71b5fe2468d 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -6,8 +6,8 @@ #ifndef BITCOIN_CONSENSUS_CONSENSUS_H #define BITCOIN_CONSENSUS_CONSENSUS_H -#include #include +#include /** The maximum allowed size for a serialized block, in bytes (only for buffer size limits) */ static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000; diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h index 223b317f355..6653c2c9733 100644 --- a/src/crypto/chacha20.h +++ b/src/crypto/chacha20.h @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include // classes for ChaCha20 256-bit stream cipher developed by Daniel J. Bernstein diff --git a/src/crypto/chacha20poly1305.cpp b/src/crypto/chacha20poly1305.cpp index 06dbf6037b9..5b918d9b910 100644 --- a/src/crypto/chacha20poly1305.cpp +++ b/src/crypto/chacha20poly1305.cpp @@ -4,8 +4,8 @@ #include -#include #include +#include #include #include #include diff --git a/src/crypto/hkdf_sha256_32.h b/src/crypto/hkdf_sha256_32.h index 3010e678a46..f9f343b4b76 100644 --- a/src/crypto/hkdf_sha256_32.h +++ b/src/crypto/hkdf_sha256_32.h @@ -7,8 +7,8 @@ #include -#include #include +#include /** A rfc5869 HKDF implementation with HMAC_SHA256 and fixed key output length of 32 bytes (L=32) */ class CHKDF_HMAC_SHA256_L32 diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h index 2f729700149..ea8cee88085 100644 --- a/src/crypto/hmac_sha256.h +++ b/src/crypto/hmac_sha256.h @@ -7,8 +7,8 @@ #include -#include #include +#include /** A hasher class for HMAC-SHA-256. */ class CHMAC_SHA256 diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h index a25da385f48..d6bebc093c6 100644 --- a/src/crypto/hmac_sha512.h +++ b/src/crypto/hmac_sha512.h @@ -7,8 +7,8 @@ #include -#include #include +#include /** A hasher class for HMAC-SHA-512. */ class CHMAC_SHA512 diff --git a/src/crypto/poly1305.h b/src/crypto/poly1305.h index 1b7e355fee1..494f7cdd4d8 100644 --- a/src/crypto/poly1305.h +++ b/src/crypto/poly1305.h @@ -8,8 +8,8 @@ #include #include -#include #include +#include #define POLY1305_BLOCK_SIZE 16 diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h index 6ade63bf34d..a06a3255e21 100644 --- a/src/crypto/ripemd160.h +++ b/src/crypto/ripemd160.h @@ -5,8 +5,8 @@ #ifndef BITCOIN_CRYPTO_RIPEMD160_H #define BITCOIN_CRYPTO_RIPEMD160_H -#include #include +#include /** A hasher class for RIPEMD-160. */ class CRIPEMD160 diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h index a22b65344e1..fcb96ee6a72 100644 --- a/src/crypto/sha1.h +++ b/src/crypto/sha1.h @@ -5,8 +5,8 @@ #ifndef BITCOIN_CRYPTO_SHA1_H #define BITCOIN_CRYPTO_SHA1_H -#include #include +#include /** A hasher class for SHA1. */ class CSHA1 diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h index 460557686cf..3ac771c5d0d 100644 --- a/src/crypto/sha256.h +++ b/src/crypto/sha256.h @@ -5,8 +5,8 @@ #ifndef BITCOIN_CRYPTO_SHA256_H #define BITCOIN_CRYPTO_SHA256_H -#include #include +#include #include /** A hasher class for SHA-256. */ diff --git a/src/crypto/sha256_sse4.cpp b/src/crypto/sha256_sse4.cpp index 683d44b6b0b..d0a34934d80 100644 --- a/src/crypto/sha256_sse4.cpp +++ b/src/crypto/sha256_sse4.cpp @@ -5,8 +5,8 @@ // This is a translation to GCC extended asm syntax from YASM code by Intel // (available at the bottom of this file). -#include #include +#include #if defined(__x86_64__) || defined(__amd64__) diff --git a/src/crypto/sha3.h b/src/crypto/sha3.h index 6d114379f36..7a538e4a275 100644 --- a/src/crypto/sha3.h +++ b/src/crypto/sha3.h @@ -7,8 +7,8 @@ #include -#include #include +#include //! The Keccak-f[1600] transform. void KeccakF(uint64_t (&st)[25]); diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h index 665c8b886ed..102fa02a8cb 100644 --- a/src/crypto/sha512.h +++ b/src/crypto/sha512.h @@ -5,8 +5,8 @@ #ifndef BITCOIN_CRYPTO_SHA512_H #define BITCOIN_CRYPTO_SHA512_H -#include #include +#include /** A hasher class for SHA-512. */ class CSHA512 diff --git a/src/interfaces/node.h b/src/interfaces/node.h index 2ab9f84e734..a74695be85e 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -15,10 +15,10 @@ #include #include -#include -#include #include #include +#include +#include #include #include #include diff --git a/src/kernel/mempool_entry.h b/src/kernel/mempool_entry.h index 531ccb76b67..51a1f26642f 100644 --- a/src/kernel/mempool_entry.h +++ b/src/kernel/mempool_entry.h @@ -15,11 +15,11 @@ #include #include +#include +#include #include #include #include -#include -#include class CBlockIndex; diff --git a/src/netbase.h b/src/netbase.h index 8802be6638a..b2cc172e536 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -11,9 +11,9 @@ #include #include +#include #include #include -#include #include #include #include diff --git a/src/node/connection_types.h b/src/node/connection_types.h index 08f08824996..a00895e2a8a 100644 --- a/src/node/connection_types.h +++ b/src/node/connection_types.h @@ -5,8 +5,8 @@ #ifndef BITCOIN_NODE_CONNECTION_TYPES_H #define BITCOIN_NODE_CONNECTION_TYPES_H -#include #include +#include /** Different types of connections to a peer. This enum encapsulates the * information we have available at the time of opening or accepting the diff --git a/src/node/miner.h b/src/node/miner.h index 047413534b6..a9a88b39cf2 100644 --- a/src/node/miner.h +++ b/src/node/miner.h @@ -13,9 +13,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/src/node/mini_miner.h b/src/node/mini_miner.h index 07e6239c376..73143e829e7 100644 --- a/src/node/mini_miner.h +++ b/src/node/mini_miner.h @@ -9,11 +9,11 @@ #include #include +#include #include #include #include #include -#include #include class CFeeRate; diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 4c2b03bad08..0916c631c2f 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -7,8 +7,8 @@ #include #include -#include #include +#include #include #include diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index ef234c6283e..4fa62447af6 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -43,8 +43,8 @@ #include #include -#include #include +#include using interfaces::BlockRef; using interfaces::BlockTemplate; diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 93541a93300..9c26e5c733c 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -42,8 +42,8 @@ #include #include -#include #include +#include #include diff --git a/src/rpc/server.h b/src/rpc/server.h index ba9e4d7d7cd..d4b48f2418f 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -9,9 +9,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/src/streams.h b/src/streams.h index 0b3b939fabd..5a596047121 100644 --- a/src/streams.h +++ b/src/streams.h @@ -14,12 +14,12 @@ #include #include #include +#include #include +#include #include #include #include -#include -#include #include #include #include diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp index 962192cefd3..a13945a5206 100644 --- a/src/test/fuzz/addrman.cpp +++ b/src/test/fuzz/addrman.cpp @@ -14,12 +14,12 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include diff --git a/src/test/fuzz/cluster_linearize.cpp b/src/test/fuzz/cluster_linearize.cpp index 5ac9edfc69e..6a1ea40aef3 100644 --- a/src/test/fuzz/cluster_linearize.cpp +++ b/src/test/fuzz/cluster_linearize.cpp @@ -6,16 +6,16 @@ #include #include #include -#include #include +#include #include #include #include #include #include -#include #include +#include using namespace cluster_linearize; diff --git a/src/test/fuzz/coinscache_sim.cpp b/src/test/fuzz/coinscache_sim.cpp index 91b98292fe8..30845c2ef9c 100644 --- a/src/test/fuzz/coinscache_sim.cpp +++ b/src/test/fuzz/coinscache_sim.cpp @@ -5,14 +5,14 @@ #include #include #include -#include #include +#include #include #include -#include -#include #include +#include +#include #include namespace { diff --git a/src/test/fuzz/deserialize.cpp b/src/test/fuzz/deserialize.cpp index 5a09963e2c2..05ca62b6fd0 100644 --- a/src/test/fuzz/deserialize.cpp +++ b/src/test/fuzz/deserialize.cpp @@ -29,10 +29,10 @@ #include #include +#include #include #include #include -#include using node::SnapshotMetadata; diff --git a/src/test/fuzz/txgraph.cpp b/src/test/fuzz/txgraph.cpp index 7f7a3181b16..e4649970384 100644 --- a/src/test/fuzz/txgraph.cpp +++ b/src/test/fuzz/txgraph.cpp @@ -2,20 +2,20 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include #include -#include #include +#include #include +#include #include #include #include +#include #include #include #include #include -#include #include using namespace cluster_linearize; diff --git a/src/test/fuzz/vecdeque.cpp b/src/test/fuzz/vecdeque.cpp index 13843b2c4b0..30fc2da03f4 100644 --- a/src/test/fuzz/vecdeque.cpp +++ b/src/test/fuzz/vecdeque.cpp @@ -7,8 +7,8 @@ #include #include -#include #include +#include namespace { diff --git a/src/test/scriptnum10.h b/src/test/scriptnum10.h index 38a6fee1dc8..db66f3a14c9 100644 --- a/src/test/scriptnum10.h +++ b/src/test/scriptnum10.h @@ -7,9 +7,9 @@ #define BITCOIN_TEST_SCRIPTNUM10_H #include +#include #include #include -#include #include #include diff --git a/src/test/util/cluster_linearize.h b/src/test/util/cluster_linearize.h index b69edb496b3..a89a46552b6 100644 --- a/src/test/util/cluster_linearize.h +++ b/src/test/util/cluster_linearize.h @@ -14,8 +14,8 @@ #include #include -#include #include +#include namespace { diff --git a/src/txgraph.h b/src/txgraph.h index 6fa035fb5b8..5779397f82f 100644 --- a/src/txgraph.h +++ b/src/txgraph.h @@ -3,11 +3,11 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include +#include #include #include -#include -#include #include +#include #include diff --git a/src/util/feefrac.h b/src/util/feefrac.h index 7b3e6010d64..7577107e8c2 100644 --- a/src/util/feefrac.h +++ b/src/util/feefrac.h @@ -5,12 +5,13 @@ #ifndef BITCOIN_UTIL_FEEFRAC_H #define BITCOIN_UTIL_FEEFRAC_H -#include -#include -#include #include #include +#include +#include +#include + /** Data structure storing a fee and size, ordered by increasing fee/size. * * The size of a FeeFrac cannot be zero unless the fee is also zero. diff --git a/src/validation.h b/src/validation.h index 05a2a2df8c0..87a1de7cfb8 100644 --- a/src/validation.h +++ b/src/validation.h @@ -36,12 +36,12 @@ #include #include +#include #include #include #include #include #include -#include #include #include #include diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp index c53b6935b1b..b902dd82c1d 100644 --- a/src/wallet/sqlite.cpp +++ b/src/wallet/sqlite.cpp @@ -10,15 +10,15 @@ #include #include #include -#include #include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 8998fdb0780..1b0cfe2c4f5 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -4,9 +4,9 @@ #include +#include #include #include -#include #include #include diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index a126da394d4..5327a2cf691 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -6,11 +6,11 @@ #ifndef BITCOIN_WALLET_WALLETDB_H #define BITCOIN_WALLET_WALLETDB_H +#include #include