From 3dfd7a4e9f245c3f9938a13d605ad5d0e1abbb13 Mon Sep 17 00:00:00 2001
From: Pablo Greco <psgreco@gmail.com>
Date: Thu, 31 Aug 2023 14:24:23 -0700
Subject: [PATCH] Linter fixes

---
 src/asset.h                                                    | 3 +--
 src/blind.h                                                    | 3 +--
 src/blindpsbt.h                                                | 3 +--
 src/dynafed.h                                                  | 3 +--
 src/primitives/txwitness.h                                     | 3 +--
 src/wallet/rpc/wallet.cpp                                      | 1 -
 test/bitcoin_functional/functional/test_framework/test_node.py | 2 +-
 test/bitcoin_functional/functional/wallet_importmulti.py       | 2 +-
 8 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/asset.h b/src/asset.h
index 3083e51c7f..ceb1621625 100644
--- a/src/asset.h
+++ b/src/asset.h
@@ -1,4 +1,3 @@
-
 #ifndef BITCOIN_ASSET_H
 #define BITCOIN_ASSET_H
 
@@ -104,4 +103,4 @@ CAmount valueFor(const CAmountMap& mapValue, const CAsset& asset);
 
 std::ostream& operator<<(std::ostream& out, const CAmountMap& map);
 
-#endif //  BITCOIN_AMOUNT_H
+#endif // BITCOIN_ASSET_H
diff --git a/src/blind.h b/src/blind.h
index 0ce2140eb0..483444ad35 100644
--- a/src/blind.h
+++ b/src/blind.h
@@ -1,7 +1,6 @@
 // Copyright (c) 2017-2019 The Elements Core developers
 // // Distributed under the MIT software license, see the accompanying
 // // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
 #ifndef BITCOIN_BLIND_H
 #define BITCOIN_BLIND_H
 
@@ -78,4 +77,4 @@ int BlindTransaction(std::vector<uint256 >& input_value_blinding_factors, const
  */
 void RawFillBlinds(CMutableTransaction& tx, std::vector<uint256>& output_value_blinds, std::vector<uint256>& output_asset_blinds, std::vector<CPubKey>& output_pubkeys);
 
-#endif //BITCOIN_BLIND_H
+#endif // BITCOIN_BLIND_H
diff --git a/src/blindpsbt.h b/src/blindpsbt.h
index e396f18bf1..d79e4e77d4 100644
--- a/src/blindpsbt.h
+++ b/src/blindpsbt.h
@@ -1,7 +1,6 @@
 // Copyright (c) 2020 The Elements Core developers
 // // Distributed under the MIT software license, see the accompanying
 // // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
 #ifndef BITCOIN_BLINDPSBT_H
 #define BITCOIN_BLINDPSBT_H
 
@@ -57,4 +56,4 @@ bool VerifyBlindAssetProof(const uint256& asset, const std::vector<unsigned char
 BlindProofResult VerifyBlindProofs(const PSBTOutput& o);
 BlindProofResult VerifyBlindProofs(const PSBTInput& i);
 
-#endif //BITCOIN_BLINDPSBT_H
+#endif // BITCOIN_BLINDPSBT_H
diff --git a/src/dynafed.h b/src/dynafed.h
index 8db3288dbd..ea651631fb 100644
--- a/src/dynafed.h
+++ b/src/dynafed.h
@@ -1,4 +1,3 @@
-
 #ifndef BITCOIN_DYNAFED_H
 #define BITCOIN_DYNAFED_H
 
@@ -17,4 +16,4 @@ DynaFedParamEntry ComputeNextBlockFullCurrentParameters(const CBlockIndex* pinde
 DynaFedParamEntry ComputeNextBlockCurrentParameters(const CBlockIndex* pindexPrev, const Consensus::Params& consensus);
 
 
-#endif //  BITCOIN_DYNAFED_H
+#endif // BITCOIN_DYNAFED_H
diff --git a/src/primitives/txwitness.h b/src/primitives/txwitness.h
index cfd0de69f9..93c5a3b303 100644
--- a/src/primitives/txwitness.h
+++ b/src/primitives/txwitness.h
@@ -1,7 +1,6 @@
 // Copyright (c) 2016-2019 The Elements developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
 #ifndef BITCOIN_PRIMITIVES_TXWITNESS_H
 #define BITCOIN_PRIMITIVES_TXWITNESS_H
 
@@ -151,4 +150,4 @@ private:
 uint256 ComputeFastMerkleRoot(const std::vector<uint256>& hashes);
 
 
-#endif //BITCOIN_PRIMITIVES_TXWITNESS_H
+#endif // BITCOIN_PRIMITIVES_TXWITNESS_H
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index 3d228de5b9..550da97d8f 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -11,7 +11,6 @@
 #include <wallet/receive.h>
 #include <wallet/rpc/wallet.h>
 #include <wallet/rpc/util.h>
-#include <wallet/rpc/wallet.h>
 
 #include <optional>
 
diff --git a/test/bitcoin_functional/functional/test_framework/test_node.py b/test/bitcoin_functional/functional/test_framework/test_node.py
index 352774914d..aabc295af1 100755
--- a/test/bitcoin_functional/functional/test_framework/test_node.py
+++ b/test/bitcoin_functional/functional/test_framework/test_node.py
@@ -373,7 +373,7 @@ class TestNode():
                 stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL) == 0
 
         if not sys.platform.startswith('linux'):
-            self.log.warning("Can't profile with perf; only availabe on Linux platforms")
+            self.log.warning("Can't profile with perf; only available on Linux platforms")
             return None
 
         if not test_success('which perf'):
diff --git a/test/bitcoin_functional/functional/wallet_importmulti.py b/test/bitcoin_functional/functional/wallet_importmulti.py
index 8e25aa7337..8830d547fb 100755
--- a/test/bitcoin_functional/functional/wallet_importmulti.py
+++ b/test/bitcoin_functional/functional/wallet_importmulti.py
@@ -760,7 +760,7 @@ class ImportMultiTest(BitcoinTestFramework):
         assert_equal(addr2, newaddr2)
 
         # Import a multisig and make sure the keys don't go into the keypool
-        self.log.info('Imported scripts with pubkeys shoud not have their pubkeys go into the keypool')
+        self.log.info('Imported scripts with pubkeys should not have their pubkeys go into the keypool')
         addr1 = self.nodes[0].getnewaddress()
         addr2 = self.nodes[0].getnewaddress()
         pub1 = self.nodes[0].getaddressinfo(addr1)['pubkey']