From 07f2c25d04c39a0074e1d9ee1b24b3e359c8153f Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Thu, 9 Jun 2022 16:26:55 +0100
Subject: [PATCH] refactor: add most of src/util to iwyu

These files change infrequently, and not much header shuffling is required.

We don't add everything in src/util/ yet, because IWYU makes some
dubious suggestions, which I'm going to follow up with upstream.
---
 ci/test/06_script_b.sh      | 12 ++++++++++++
 src/util/asmap.cpp          |  5 ++++-
 src/util/bip32.cpp          |  7 +++++--
 src/util/bip32.h            |  1 +
 src/util/bytevectorhash.cpp |  2 ++
 src/util/bytevectorhash.h   |  3 ++-
 src/util/error.cpp          |  4 +++-
 src/util/hasher.cpp         |  4 ++--
 src/util/hasher.h           |  6 ++++++
 src/util/message.cpp        | 18 +++++++++++-------
 src/util/message.h          |  3 ++-
 src/util/moneystr.cpp       |  1 +
 src/util/readwritefile.cpp  |  3 ++-
 src/util/serfloat.h         |  2 +-
 src/util/spanparsing.cpp    |  3 ++-
 src/util/strencodings.cpp   |  9 +++++----
 src/util/strencodings.h     |  5 ++++-
 src/util/string.cpp         |  2 ++
 src/util/syserror.cpp       |  1 +
 src/util/thread.cpp         |  1 +
 src/util/time.cpp           | 13 ++++++++-----
 src/util/time.h             |  2 +-
 src/util/translation.h      |  2 ++
 src/util/url.cpp            |  3 ++-
 src/util/vector.h           |  1 +
 25 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh
index 32f0ea5e425..e1032ba6bd6 100755
--- a/ci/test/06_script_b.sh
+++ b/ci/test/06_script_b.sh
@@ -47,6 +47,18 @@ if [ "${RUN_TIDY}" = "true" ]; then
           " src/rpc/fees.cpp"\
           " src/rpc/signmessage.cpp"\
           " src/test/fuzz/txorphan.cpp"\
+          " src/util/bip32.cpp"\
+          " src/util/bytevectorhash.cpp"\
+          " src/util/error.cpp"\
+          " src/util/getuniquepath.cpp"\
+          " src/util/hasher.cpp"\
+          " src/util/message.cpp"\
+          " src/util/moneystr.cpp"\
+          " src/util/serfloat.cpp"\
+          " src/util/spanparsing.cpp"\
+          " src/util/strencodings.cpp"\
+          " src/util/syserror.cpp"\
+          " src/util/url.cpp"\
           " -p . ${MAKEJOBS} -- -Xiwyu --cxx17ns -Xiwyu --mapping_file=${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp"
 fi
 
diff --git a/src/util/asmap.cpp b/src/util/asmap.cpp
index ceb8379c1c1..b1db3b5f0d1 100644
--- a/src/util/asmap.cpp
+++ b/src/util/asmap.cpp
@@ -8,10 +8,13 @@
 #include <crypto/common.h>
 #include <fs.h>
 #include <logging.h>
+#include <serialize.h>
 #include <streams.h>
 
+#include <algorithm>
 #include <cassert>
-#include <map>
+#include <cstdio>
+#include <utility>
 #include <vector>
 
 namespace {
diff --git a/src/util/bip32.cpp b/src/util/bip32.cpp
index 4c7e948368a..39e43eeb318 100644
--- a/src/util/bip32.cpp
+++ b/src/util/bip32.cpp
@@ -2,12 +2,15 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <sstream>
-#include <stdio.h>
 #include <tinyformat.h>
 #include <util/bip32.h>
 #include <util/strencodings.h>
 
+#include <algorithm>
+#include <cstdint>
+#include <cstdio>
+#include <sstream>
+
 
 bool ParseHDKeypath(const std::string& keypath_str, std::vector<uint32_t>& keypath)
 {
diff --git a/src/util/bip32.h b/src/util/bip32.h
index aa4eac3791f..0872bc88de6 100644
--- a/src/util/bip32.h
+++ b/src/util/bip32.h
@@ -5,6 +5,7 @@
 #ifndef BITCOIN_UTIL_BIP32_H
 #define BITCOIN_UTIL_BIP32_H
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/src/util/bytevectorhash.cpp b/src/util/bytevectorhash.cpp
index 9054db4759a..6d777613e61 100644
--- a/src/util/bytevectorhash.cpp
+++ b/src/util/bytevectorhash.cpp
@@ -6,6 +6,8 @@
 #include <random.h>
 #include <util/bytevectorhash.h>
 
+#include <vector>
+
 ByteVectorHash::ByteVectorHash() :
     m_k0(GetRand<uint64_t>()),
     m_k1(GetRand<uint64_t>())
diff --git a/src/util/bytevectorhash.h b/src/util/bytevectorhash.h
index b88c17460b4..c2322b8daff 100644
--- a/src/util/bytevectorhash.h
+++ b/src/util/bytevectorhash.h
@@ -5,7 +5,8 @@
 #ifndef BITCOIN_UTIL_BYTEVECTORHASH_H
 #define BITCOIN_UTIL_BYTEVECTORHASH_H
 
-#include <stdint.h>
+#include <cstdint>
+#include <cstddef>
 #include <vector>
 
 /**
diff --git a/src/util/error.cpp b/src/util/error.cpp
index 22a59642790..33a35a6d59f 100644
--- a/src/util/error.cpp
+++ b/src/util/error.cpp
@@ -5,9 +5,11 @@
 #include <util/error.h>
 
 #include <tinyformat.h>
-#include <util/system.h>
 #include <util/translation.h>
 
+#include <cassert>
+#include <string>
+
 bilingual_str TransactionErrorString(const TransactionError err)
 {
     switch (err) {
diff --git a/src/util/hasher.cpp b/src/util/hasher.cpp
index c21941eb88f..a80f20c8945 100644
--- a/src/util/hasher.cpp
+++ b/src/util/hasher.cpp
@@ -2,11 +2,11 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <crypto/siphash.h>
 #include <random.h>
+#include <span.h>
 #include <util/hasher.h>
 
-#include <limits>
-
 SaltedTxidHasher::SaltedTxidHasher() : k0(GetRand<uint64_t>()), k1(GetRand<uint64_t>()) {}
 
 SaltedOutpointHasher::SaltedOutpointHasher() : k0(GetRand<uint64_t>()), k1(GetRand<uint64_t>()) {}
diff --git a/src/util/hasher.h b/src/util/hasher.h
index 3d24a4d23cd..426b8990e6a 100644
--- a/src/util/hasher.h
+++ b/src/util/hasher.h
@@ -5,10 +5,16 @@
 #ifndef BITCOIN_UTIL_HASHER_H
 #define BITCOIN_UTIL_HASHER_H
 
+#include <crypto/common.h>
 #include <crypto/siphash.h>
 #include <primitives/transaction.h>
 #include <uint256.h>
 
+#include <cstdint>
+#include <cstring>
+
+template <typename C> class Span;
+
 class SaltedTxidHasher
 {
 private:
diff --git a/src/util/message.cpp b/src/util/message.cpp
index f58876f915b..d395c4b0bcc 100644
--- a/src/util/message.cpp
+++ b/src/util/message.cpp
@@ -3,16 +3,20 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <hash.h>            // For CHashWriter
-#include <key.h>             // For CKey
-#include <key_io.h>          // For DecodeDestination()
-#include <pubkey.h>          // For CPubKey
-#include <script/standard.h> // For CTxDestination, IsValidDestination(), PKHash
-#include <serialize.h>       // For SER_GETHASH
+#include <hash.h>
+#include <key.h>
+#include <key_io.h>
+#include <pubkey.h>
+#include <script/standard.h>
+#include <serialize.h>
+#include <uint256.h>
 #include <util/message.h>
-#include <util/strencodings.h> // For DecodeBase64()
+#include <util/strencodings.h>
 
+#include <cassert>
+#include <optional>
 #include <string>
+#include <variant>
 #include <vector>
 
 /**
diff --git a/src/util/message.h b/src/util/message.h
index b31c5f5761b..1b7febe60a2 100644
--- a/src/util/message.h
+++ b/src/util/message.h
@@ -6,11 +6,12 @@
 #ifndef BITCOIN_UTIL_MESSAGE_H
 #define BITCOIN_UTIL_MESSAGE_H
 
-#include <key.h> // For CKey
 #include <uint256.h>
 
 #include <string>
 
+class CKey;
+
 extern const std::string MESSAGE_MAGIC;
 
 /** The result of a signed message verification.
diff --git a/src/util/moneystr.cpp b/src/util/moneystr.cpp
index 8c4bc6e6f42..d9e6cef600f 100644
--- a/src/util/moneystr.cpp
+++ b/src/util/moneystr.cpp
@@ -10,6 +10,7 @@
 #include <util/strencodings.h>
 #include <util/string.h>
 
+#include <cstdint>
 #include <optional>
 
 std::string FormatMoney(const CAmount n)
diff --git a/src/util/readwritefile.cpp b/src/util/readwritefile.cpp
index 628e6a3980b..3ec08119e7f 100644
--- a/src/util/readwritefile.cpp
+++ b/src/util/readwritefile.cpp
@@ -5,8 +5,9 @@
 
 #include <fs.h>
 
+#include <algorithm>
+#include <cstdio>
 #include <limits>
-#include <stdio.h>
 #include <string>
 #include <utility>
 
diff --git a/src/util/serfloat.h b/src/util/serfloat.h
index 4d912b0176e..343ccb9d3ab 100644
--- a/src/util/serfloat.h
+++ b/src/util/serfloat.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_UTIL_SERFLOAT_H
 #define BITCOIN_UTIL_SERFLOAT_H
 
-#include <stdint.h>
+#include <cstdint>
 
 /* Encode a double using the IEEE 754 binary64 format. All NaNs are encoded as x86/ARM's
  * positive quiet NaN with payload 0. */
diff --git a/src/util/spanparsing.cpp b/src/util/spanparsing.cpp
index 8614bd11769..565c867e182 100644
--- a/src/util/spanparsing.cpp
+++ b/src/util/spanparsing.cpp
@@ -6,8 +6,9 @@
 
 #include <span.h>
 
+#include <algorithm>
+#include <cstddef>
 #include <string>
-#include <vector>
 
 namespace spanparsing {
 
diff --git a/src/util/strencodings.cpp b/src/util/strencodings.cpp
index 675fe7d2d79..303e19beec9 100644
--- a/src/util/strencodings.cpp
+++ b/src/util/strencodings.cpp
@@ -3,17 +3,18 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <span.h>
 #include <util/strencodings.h>
-#include <util/string.h>
-
-#include <tinyformat.h>
 
 #include <algorithm>
 #include <array>
-#include <cstdlib>
+#include <cassert>
 #include <cstring>
 #include <limits>
 #include <optional>
+#include <ostream>
+#include <string>
+#include <vector>
 
 static const std::string CHARS_ALPHA_NUM = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 
diff --git a/src/util/strencodings.h b/src/util/strencodings.h
index 9a96bbe67b9..14867b21b2c 100644
--- a/src/util/strencodings.h
+++ b/src/util/strencodings.h
@@ -13,11 +13,14 @@
 #include <util/string.h>
 
 #include <charconv>
+#include <cstddef>
 #include <cstdint>
-#include <iterator>
 #include <limits>
 #include <optional>
 #include <string>
+#include <string_view>
+#include <system_error>
+#include <type_traits>
 #include <vector>
 
 /** Used by SanitizeString() */
diff --git a/src/util/string.cpp b/src/util/string.cpp
index d05222e8b8a..dff782c3309 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -6,6 +6,8 @@
 
 #include <boost/algorithm/string/replace.hpp>
 
+#include <string>
+
 void ReplaceAll(std::string& in_out, std::string_view search, std::string_view substitute)
 {
     boost::replace_all(in_out, search, substitute);
diff --git a/src/util/syserror.cpp b/src/util/syserror.cpp
index 391ddd35602..5270f553660 100644
--- a/src/util/syserror.cpp
+++ b/src/util/syserror.cpp
@@ -10,6 +10,7 @@
 #include <util/syserror.h>
 
 #include <cstring>
+#include <string>
 
 std::string SysErrorString(int err)
 {
diff --git a/src/util/thread.cpp b/src/util/thread.cpp
index 14be6686859..f9f427ba202 100644
--- a/src/util/thread.cpp
+++ b/src/util/thread.cpp
@@ -9,6 +9,7 @@
 #include <util/threadnames.h>
 
 #include <exception>
+#include <functional>
 
 void util::TraceThread(const char* thread_name, std::function<void()> thread_func)
 {
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 7d9d6bcff19..2cafc55c692 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -8,16 +8,19 @@
 #endif
 
 #include <compat.h>
+#include <tinyformat.h>
 #include <util/time.h>
-
 #include <util/check.h>
 
-#include <atomic>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <ctime>
-#include <thread>
 
-#include <tinyformat.h>
+#include <atomic>
+#include <chrono>
+#include <ctime>
+#include <locale>
+#include <thread>
+#include <sstream>
+#include <string>
 
 void UninterruptibleSleep(const std::chrono::microseconds& n) { std::this_thread::sleep_for(n); }
 
diff --git a/src/util/time.h b/src/util/time.h
index 0f87d66c2ee..9df69a953c6 100644
--- a/src/util/time.h
+++ b/src/util/time.h
@@ -9,7 +9,7 @@
 #include <compat.h>
 
 #include <chrono>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 
 using namespace std::chrono_literals;
diff --git a/src/util/translation.h b/src/util/translation.h
index aee601d9c10..07b7f43c8a8 100644
--- a/src/util/translation.h
+++ b/src/util/translation.h
@@ -6,7 +6,9 @@
 #define BITCOIN_UTIL_TRANSLATION_H
 
 #include <tinyformat.h>
+
 #include <functional>
+#include <string>
 
 /**
  * Bilingual messages:
diff --git a/src/util/url.cpp b/src/util/url.cpp
index e42d93bce8a..ea9323e6669 100644
--- a/src/util/url.cpp
+++ b/src/util/url.cpp
@@ -5,7 +5,8 @@
 #include <util/url.h>
 
 #include <event2/http.h>
-#include <stdlib.h>
+
+#include <cstdlib>
 #include <string>
 
 std::string urlDecode(const std::string &urlEncoded) {
diff --git a/src/util/vector.h b/src/util/vector.h
index dab65ded2ac..ed745affe54 100644
--- a/src/util/vector.h
+++ b/src/util/vector.h
@@ -7,6 +7,7 @@
 
 #include <initializer_list>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 /** Construct a vector with the specified elements.