refactor: Sort includes of touched source files

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 <bench/bench.h>
 #include <random.h>
-#include <cstddef>
 #include <util/strencodings.h>
+
 #include <cassert>
+#include <cstddef>
 #include <optional>
 #include <vector>
 

src/bip324.cpp

@@ -17,8 +17,8 @@
 
 #include <algorithm>
 #include <cassert>
-#include <cstdint>
 #include <cstddef>
+#include <cstdint>
 #include <iterator>
 #include <string>
 

src/cluster_linearize.h

@@ -6,11 +6,11 @@
 #define BITCOIN_CLUSTER_LINEARIZE_H
 
 #include <algorithm>
+#include <cstdint>
 #include <numeric>
 #include <optional>
-#include <cstdint>
-#include <vector>
 #include <utility>
+#include <vector>
 
 #include <random.h>
 #include <span.h>

src/common/args.h

@@ -11,12 +11,12 @@
 #include <util/chaintype.h>
 #include <util/fs.h>
 
+#include <cstdint>
 #include <iosfwd>
 #include <list>
 #include <map>
 #include <optional>
 #include <set>
-#include <cstdint>
 #include <string>
 #include <variant>
 #include <vector>

src/consensus/consensus.h

@@ -6,8 +6,8 @@
 #ifndef BITCOIN_CONSENSUS_CONSENSUS_H
 #define BITCOIN_CONSENSUS_CONSENSUS_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** The maximum allowed size for a serialized block, in bytes (only for buffer size limits) */
 static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000;

src/crypto/chacha20.h

@@ -9,8 +9,8 @@
 
 #include <array>
 #include <cstddef>
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 #include <utility>
 
 // classes for ChaCha20 256-bit stream cipher developed by Daniel J. Bernstein

src/crypto/chacha20poly1305.cpp

@@ -4,8 +4,8 @@
 
 #include <crypto/chacha20poly1305.h>
 
-#include <crypto/common.h>
 #include <crypto/chacha20.h>
+#include <crypto/common.h>
 #include <crypto/poly1305.h>
 #include <span.h>
 #include <support/cleanse.h>

src/crypto/hkdf_sha256_32.h

@@ -7,8 +7,8 @@
 
 #include <crypto/hmac_sha256.h>
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A rfc5869 HKDF implementation with HMAC_SHA256 and fixed key output length of 32 bytes (L=32) */
 class CHKDF_HMAC_SHA256_L32

src/crypto/hmac_sha256.h

@@ -7,8 +7,8 @@
 
 #include <crypto/sha256.h>
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for HMAC-SHA-256. */
 class CHMAC_SHA256

src/crypto/hmac_sha512.h

@@ -7,8 +7,8 @@
 
 #include <crypto/sha512.h>
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for HMAC-SHA-512. */
 class CHMAC_SHA512

src/crypto/poly1305.h

@@ -8,8 +8,8 @@
 #include <span.h>
 
 #include <cassert>
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 #define POLY1305_BLOCK_SIZE 16
 

src/crypto/ripemd160.h

@@ -5,8 +5,8 @@
 #ifndef BITCOIN_CRYPTO_RIPEMD160_H
 #define BITCOIN_CRYPTO_RIPEMD160_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for RIPEMD-160. */
 class CRIPEMD160

src/crypto/sha1.h

@@ -5,8 +5,8 @@
 #ifndef BITCOIN_CRYPTO_SHA1_H
 #define BITCOIN_CRYPTO_SHA1_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for SHA1. */
 class CSHA1

src/crypto/sha256.h

@@ -5,8 +5,8 @@
 #ifndef BITCOIN_CRYPTO_SHA256_H
 #define BITCOIN_CRYPTO_SHA256_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 #include <string>
 
 /** A hasher class for SHA-256. */

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 <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 #if defined(__x86_64__) || defined(__amd64__)
 

src/crypto/sha3.h

@@ -7,8 +7,8 @@
 
 #include <span.h>
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 //! The Keccak-f[1600] transform.
 void KeccakF(uint64_t (&st)[25]);

src/crypto/sha512.h

@@ -5,8 +5,8 @@
 #ifndef BITCOIN_CRYPTO_SHA512_H
 #define BITCOIN_CRYPTO_SHA512_H
 
-#include <cstdlib>
 #include <cstdint>
+#include <cstdlib>
 
 /** A hasher class for SHA-512. */
 class CSHA512

src/interfaces/node.h

@@ -15,10 +15,10 @@
 #include <support/allocators/secure.h>
 #include <util/translation.h>
 
-#include <functional>
-#include <memory>
 #include <cstddef>
 #include <cstdint>
+#include <functional>
+#include <memory>
 #include <string>
 #include <tuple>
 #include <vector>

src/kernel/mempool_entry.h

@@ -15,11 +15,11 @@
 #include <util/overflow.h>
 
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <set>
-#include <cstddef>
-#include <cstdint>
 
 class CBlockIndex;
 

src/netbase.h

@@ -11,9 +11,9 @@
 #include <util/sock.h>
 #include <util/threadinterrupt.h>
 
+#include <cstdint>
 #include <functional>
 #include <memory>
-#include <cstdint>
 #include <string>
 #include <type_traits>
 #include <unordered_set>

src/node/connection_types.h

@@ -5,8 +5,8 @@
 #ifndef BITCOIN_NODE_CONNECTION_TYPES_H
 #define BITCOIN_NODE_CONNECTION_TYPES_H
 
-#include <string>
 #include <cstdint>
+#include <string>
 
 /** Different types of connections to a peer. This enum encapsulates the
  * information we have available at the time of opening or accepting the

src/node/miner.h

@@ -13,9 +13,9 @@
 #include <txmempool.h>
 #include <util/feefrac.h>
 
+#include <cstdint>
 #include <memory>
 #include <optional>
-#include <cstdint>
 
 #include <boost/multi_index/identity.hpp>
 #include <boost/multi_index/indexed_by.hpp>

src/node/mini_miner.h

@@ -9,11 +9,11 @@
 #include <primitives/transaction.h>
 #include <uint256.h>
 
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
 #include <set>
-#include <cstdint>
 #include <vector>
 
 class CFeeRate;

src/rpc/client.cpp

@@ -7,8 +7,8 @@
 #include <rpc/client.h>
 #include <tinyformat.h>
 
-#include <set>
 #include <cstdint>
+#include <set>
 #include <string>
 #include <string_view>
 

src/rpc/mining.cpp

@@ -43,8 +43,8 @@
 #include <validation.h>
 #include <validationinterface.h>
 
-#include <memory>
 #include <cstdint>
+#include <memory>
 
 using interfaces::BlockRef;
 using interfaces::BlockTemplate;

src/rpc/rawtransaction.cpp

@@ -42,8 +42,8 @@
 #include <validation.h>
 #include <validationinterface.h>
 
-#include <numeric>
 #include <cstdint>
+#include <numeric>
 
 #include <univalue.h>
 

src/rpc/server.h

@@ -9,9 +9,9 @@
 #include <rpc/request.h>
 #include <rpc/util.h>
 
+#include <cstdint>
 #include <functional>
 #include <map>
-#include <cstdint>
 #include <string>
 
 #include <univalue.h>

src/streams.h

@@ -14,12 +14,12 @@
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
+#include <cstdint>
 #include <cstdio>
+#include <cstring>
 #include <ios>
 #include <limits>
 #include <optional>
-#include <cstdint>
-#include <cstring>
 #include <string>
 #include <utility>
 #include <vector>

src/test/fuzz/addrman.cpp

@@ -14,12 +14,12 @@
 #include <test/fuzz/util.h>
 #include <test/fuzz/util/net.h>
 #include <test/util/setup_common.h>
-#include <ctime>
 #include <util/asmap.h>
 #include <util/chaintype.h>
 
 #include <cassert>
 #include <cstdint>
+#include <ctime>
 #include <optional>
 #include <string>
 #include <vector>

src/test/fuzz/cluster_linearize.cpp

@@ -6,16 +6,16 @@
 #include <random.h>
 #include <serialize.h>
 #include <streams.h>
-#include <test/fuzz/fuzz.h>
 #include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
 #include <test/util/cluster_linearize.h>
 #include <util/bitset.h>
 #include <util/feefrac.h>
 
 #include <algorithm>
 #include <cstdint>
-#include <vector>
 #include <utility>
+#include <vector>
 
 using namespace cluster_linearize;
 

src/test/fuzz/coinscache_sim.cpp

@@ -5,14 +5,14 @@
 #include <coins.h>
 #include <crypto/sha256.h>
 #include <primitives/transaction.h>
-#include <test/fuzz/fuzz.h>
 #include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
 #include <test/fuzz/util.h>
 
 #include <cassert>
-#include <optional>
-#include <memory>
 #include <cstdint>
+#include <memory>
+#include <optional>
 #include <vector>
 
 namespace {

src/test/fuzz/deserialize.cpp

@@ -29,10 +29,10 @@
 #include <test/util/setup_common.h>
 #include <undo.h>
 
+#include <cstdint>
 #include <exception>
 #include <optional>
 #include <stdexcept>
-#include <cstdint>
 
 using node::SnapshotMetadata;
 

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 <txgraph.h>
 #include <cluster_linearize.h>
-#include <test/fuzz/fuzz.h>
 #include <test/fuzz/FuzzedDataProvider.h>
+#include <test/fuzz/fuzz.h>
 #include <test/util/random.h>
+#include <txgraph.h>
 #include <util/bitset.h>
 #include <util/feefrac.h>
 
 #include <algorithm>
+#include <cstdint>
 #include <iterator>
 #include <map>
 #include <memory>
 #include <set>
-#include <cstdint>
 #include <utility>
 
 using namespace cluster_linearize;

src/test/fuzz/vecdeque.cpp

@@ -7,8 +7,8 @@
 #include <test/fuzz/util.h>
 #include <util/vecdeque.h>
 
-#include <deque>
 #include <cstdint>
+#include <deque>
 
 namespace {
 

src/test/scriptnum10.h

@@ -7,9 +7,9 @@
 #define BITCOIN_TEST_SCRIPTNUM10_H
 
 #include <cassert>
+#include <cstdint>
 #include <limits>
 #include <stdexcept>
-#include <cstdint>
 #include <string>
 #include <vector>
 

src/test/util/cluster_linearize.h

@@ -14,8 +14,8 @@
 
 #include <cstdint>
 #include <numeric>
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace {
 

src/txgraph.h

@@ -3,11 +3,11 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <compare>
+#include <cstdint>
 #include <memory>
 #include <optional>
-#include <cstdint>
-#include <vector>
 #include <utility>
+#include <vector>
 
 #include <util/feefrac.h>
 

src/util/feefrac.h

@@ -5,12 +5,13 @@
 #ifndef BITCOIN_UTIL_FEEFRAC_H
 #define BITCOIN_UTIL_FEEFRAC_H
 
-#include <cstdint>
-#include <compare>
-#include <vector>
 #include <span.h>
 #include <util/check.h>
 
+#include <compare>
+#include <cstdint>
+#include <vector>
+
 /** 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.

src/validation.h

@@ -36,12 +36,12 @@
 #include <versionbits.h>
 
 #include <atomic>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <optional>
 #include <set>
 #include <span>
-#include <cstdint>
 #include <string>
 #include <type_traits>
 #include <utility>

src/wallet/sqlite.cpp

@@ -10,15 +10,15 @@
 #include <crypto/common.h>
 #include <logging.h>
 #include <sync.h>
-#include <util/fs_helpers.h>
 #include <util/check.h>
+#include <util/fs_helpers.h>
 #include <util/strencodings.h>
 #include <util/translation.h>
 #include <wallet/db.h>
 
 #include <sqlite3.h>
-#include <cstdint>
 
+#include <cstdint>
 #include <optional>
 #include <utility>
 #include <vector>

src/wallet/test/wallet_tests.cpp

@@ -4,9 +4,9 @@
 
 #include <wallet/wallet.h>
 
+#include <cstdint>
 #include <future>
 #include <memory>
-#include <cstdint>
 #include <vector>
 
 #include <addresstype.h>

src/wallet/walletdb.h

@@ -6,11 +6,11 @@
 #ifndef BITCOIN_WALLET_WALLETDB_H
 #define BITCOIN_WALLET_WALLETDB_H
 
+#include <key.h>
 #include <script/sign.h>
 #include <util/transaction_identifier.h>
 #include <wallet/db.h>
 #include <wallet/walletutil.h>
-#include <key.h>
 
 #include <cstdint>
 #include <string>