Fix: linter errors

Author: tomt1664

ci/test/03_test_script.sh

@@ -124,11 +124,11 @@ fi
 # === CMake build (modern path used by the fork) ===
 if [ -n "$NO_DEPENDS" ]; then
   echo "Building with CMake (NO_DEPENDS=1)..."
-  cmake -B build -S . ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} $BITCOIN_CONFIG_ALL
+  cmake -B build -S . ${CMAKE_GENERATOR:+-G "$CMAKE_GENERATOR"} "$BITCOIN_CONFIG_ALL"
 else
   # depends path (still uses configure in some jobs)
   ./autogen.sh
-  ./configure $BITCOIN_CONFIG_ALL
+  ./configure "$BITCOIN_CONFIG_ALL"
 fi
 
 cmake --build build --config Release --parallel "$MAKEJOBS"
@@ -159,12 +159,12 @@ cd "${BASE_BUILD_DIR}/elements-$HOST"
 
 bash -c "./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false)
 
-# ELEMENTS FIXME: fix fix in order to correctly run it #30454 
+# ELEMENTS FIXME: fix fix in order to correctly run it #30454
 # # Folder where the build is done.
 # BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build-$HOST}
 # mkdir -p "${BASE_BUILD_DIR}"
 # cd "${BASE_BUILD_DIR}"
-# 
+#
 # BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DENABLE_EXTERNAL_SIGNER=ON -DCMAKE_INSTALL_PREFIX=$BASE_OUTDIR"
 
 

contrib/devtools/deterministic-fuzz-coverage/src/main.rs

@@ -165,7 +165,7 @@ fn deterministic_coverage(
             .success();
         if !same {
             eprintln!();
-            eprintln!("The coverage was not determinstic between runs.");
+            eprintln!("The coverage was not deterministic between runs.");
             eprintln!("{}", err);
             eprintln!("Exiting.");
             exit(1);

contrib/merge-prs.sh

@@ -23,7 +23,7 @@ PR_PREFIX="bitcoin/bitcoin"
 # Set your git worktree location here. This is where the merges will be done, and where you should checkout the merged-master branch.
 WORKTREE="/home/byron/code/elements-worktree"
 
-# Set your parallellism during build/test. You probably want as many cores as possible.
+# Set your parallelism during build/test. You probably want as many cores as possible.
 # Parallel functional tests can somewhat exceed your core count, depends on the build machine CPU/RAM.
 PARALLEL_BUILD=23  # passed to make -j
 PARALLEL_TEST=46  # passed to test_runner.py --jobs
@@ -142,7 +142,7 @@ echo start > merge.log
 
 quietly () {
     if [[ "$VERBOSE" == "1" ]]; then
-	date | tee --append merge.log
+    date | tee --append merge.log
         time "$@" 2>&1 | tee --append merge.log
     else
         chronic "$@"
@@ -158,7 +158,7 @@ notify () {
         echo "$MESSAGE"
     fi
     if [[ "$2" == "1" ]]; then
-	    exit 1
+        exit 1
     fi
 }
 
@@ -170,7 +170,7 @@ do
     CHAIN=$(echo "$line" | cut -d ' ' -f 4)
     PR_ID=$(echo "$line" | grep -o -P "#\d+")
 
-	GIT_HEAD=$(git rev-parse HEAD)
+    GIT_HEAD=$(git rev-parse HEAD)
 
     ## Do it
     if [[ "$1" == "list-only" ]]; then
@@ -207,13 +207,13 @@ do
     )
     for STOPPER in "${STOPPERS[@]}"
     do
-	if [[ "$PR_ID" == *"$STOPPER"* ]]; then
-		echo "Found $STOPPER in $PR_ID! Exiting."
-		notify "hit stopper, exiting"
-		exit 1
-	else
-		echo "Didn't find $STOPPER in $PR_ID. Continuing."
-	fi
+    if [[ "$PR_ID" == *"$STOPPER"* ]]; then
+        echo "Found $STOPPER in $PR_ID! Exiting."
+        notify "hit stopper, exiting"
+        exit 1
+    else
+        echo "Didn't find $STOPPER in $PR_ID. Continuing."
+    fi
     done
 
     if [[ "$SKIP_MERGE" == "1" ]]; then

src/bench/mempool_eviction.cpp

@@ -18,8 +18,6 @@
 #include <memory>
 #include <vector>
 
-#include <primitives/transaction.h>
-
 static void AddTx(const CTransactionRef& tx, const CAmount& nFee, CTxMemPool& pool) EXCLUSIVE_LOCKS_REQUIRED(cs_main, pool.cs)
 {
     int64_t nTime = 0;

src/chainparams.cpp

@@ -22,13 +22,13 @@
 #include <util/moneystr.h>
 #include <util/strencodings.h>
 #include <util/string.h>
-#include <crypto/sha256.h>
 
 #include <cassert>
 #include <cstdint>
 #include <limits>
 #include <stdexcept>
 #include <vector>
+#include <bitcoin-build-config.h> // IWYU pragma: keep
 
 using util::SplitString;
 

src/chainparamsbase.cpp

@@ -14,6 +14,7 @@
 #include <util/chaintype.h>
 
 #include <assert.h>
+#include <bitcoin-build-config.h> // IWYU pragma: keep
 
 void SetupChainParamsBaseOptions(ArgsManager& argsman)
 {

src/chainparamsbase.h

@@ -8,7 +8,6 @@
 #include <cstdint>
 #include <util/chaintype.h>
 
-#include <cstdint>
 #include <memory>
 #include <string>
 

src/common/args.cpp

@@ -39,6 +39,7 @@
 #include <string>
 #include <utility>
 #include <variant>
+#include <bitcoin-build-config.h> // IWYU pragma: keep
 
 #ifdef LIQUID
 const char * const BITCOIN_CONF_FILENAME = "liquid.conf";

src/confidential_validation.cpp

@@ -86,7 +86,7 @@ std::optional<std::pair<ScriptError, std::string>> CSurjectionCheck::operator()(
         error = SCRIPT_ERR_SURJECTION;
         return std::make_pair(error, std::move(debug_str));
     }
-    
+
     return std::nullopt;
 }
 

src/init.cpp

@@ -983,7 +983,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
     if (chain.chain_type == ChainType::TESTNET) {
         LogInfo("Warning: Support for testnet3 is deprecated and will be removed in an upcoming release. Consider switching to testnet4.\n");
     }
-    
+
     if (!fs::is_directory(args.GetBlocksDirPath())) {
         return InitError(strprintf(_("Specified blocks directory \"%s\" does not exist."), args.GetArg("-blocksdir", "")));
     }
@@ -1146,7 +1146,7 @@ bool AppInitParameterInteraction(const ArgsManager& args)
     } catch (const std::exception& e) {
         return InitError(Untranslated(strprintf("Error in -assetdir: %s\n", e.what())));
     }
-    
+
     const std::vector<std::string> test_options = args.GetArgs("-test");
     if (!test_options.empty()) {
         if (chainparams.GetChainTypeMeta().chain_type != ChainType::REGTEST && chainparams.GetChainTypeMeta().chain_type != ChainType::CUSTOM) {
@@ -1515,7 +1515,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     node.scheduler = std::make_unique<CScheduler>();
     assert(!node.reverification_scheduler);
     node.reverification_scheduler = std::make_unique<CScheduler>();
-    
+
     auto& scheduler = *node.scheduler;
 
     // Start the lightweight task scheduler thread
@@ -1572,7 +1572,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     // ELEMENTS:
     policyAsset = CAsset(uint256S(gArgs.GetArg("-feeasset", chainparams.GetConsensus().pegged_asset.GetHex())));
-    
+
     // Check port numbers
     if (!CheckHostPortOptions(args)) return false;