From 54569cc6d6f54788169061004026e62e1c08440e Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Tue, 13 Apr 2021 14:55:58 +0800
Subject: [PATCH] refactor: move all signer code inside ENABLE_EXTERNAL_SIGNER
 #ifdefs

---
 src/external_signer.cpp | 6 +++---
 src/external_signer.h   | 7 ++++---
 src/wallet/wallet.cpp   | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index b82dcc503d..be8b06eaba 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -9,6 +9,8 @@
 #include <util/system.h>
 #include <external_signer.h>
 
+#ifdef ENABLE_EXTERNAL_SIGNER
+
 ExternalSigner::ExternalSigner(const std::string& command, const std::string& fingerprint, std::string chain, std::string name): m_command(command), m_fingerprint(fingerprint), m_chain(chain), m_name(name) {}
 
 const std::string ExternalSigner::NetworkArg() const
@@ -16,8 +18,6 @@ const std::string ExternalSigner::NetworkArg() const
     return " --chain " + m_chain;
 }
 
-#ifdef ENABLE_EXTERNAL_SIGNER
-
 bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors)
 {
     // Call <command> enumerate
@@ -116,4 +116,4 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
     return true;
 }
 
-#endif
+#endif // ENABLE_EXTERNAL_SIGNER
diff --git a/src/external_signer.h b/src/external_signer.h
index 17428ba2f9..15436213b2 100644
--- a/src/external_signer.h
+++ b/src/external_signer.h
@@ -10,6 +10,8 @@
 #include <univalue.h>
 #include <util/system.h>
 
+#ifdef ENABLE_EXTERNAL_SIGNER
+
 struct PartiallySignedTransaction;
 
 class ExternalSignerException : public std::runtime_error {
@@ -43,7 +45,6 @@ public:
 
     const std::string NetworkArg() const;
 
-#ifdef ENABLE_EXTERNAL_SIGNER
     //! Obtain a list of signers. Calls `<command> enumerate`.
     //! @param[in]              command the command which handles interaction with the external signer
     //! @param[in,out] signers  vector to which new signers (with a unique master key fingerprint) are added
@@ -66,8 +67,8 @@ public:
     //! Calls `<command> signtransaction` and passes the PSBT via stdin.
     //! @param[in,out] psbt  PartiallySignedTransaction to be signed
     bool SignTransaction(PartiallySignedTransaction& psbt, std::string& error);
-
-#endif
 };
 
+#endif // ENABLE_EXTERNAL_SIGNER
+
 #endif // BITCOIN_EXTERNAL_SIGNER_H
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index b00fa851fd..db05586eb6 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -4586,7 +4586,7 @@ void CWallet::SetupDescriptorScriptPubKeyMans()
         }
 #else
         throw std::runtime_error(std::string(__func__) + ": Wallets with external signers require Boost::Process library.");
-#endif
+#endif // ENABLE_EXTERNAL_SIGNER
     }
 }