refactor: make ExternalSigner NetworkArg() and m_chain private

Sjors · Sjors · commit d67240446620 · 2021-06-16T10:48:58.000+02:00
diff --git a/src/external_signer.cpp b/src/external_signer.cpp
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-ExternalSigner::ExternalSigner(const std::string& command, const std::string& fingerprint, const std::string chain, const std::string name): m_command(command), m_fingerprint(fingerprint), m_chain(chain), m_name(name) {}
+ExternalSigner::ExternalSigner(const std::string& command, const std::string chain, const std::string& fingerprint, const std::string name): m_command(command), m_chain(chain), m_fingerprint(fingerprint), m_name(name) {}
 
 const std::string ExternalSigner::NetworkArg() const
 {
@@ -53,7 +53,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
         if (model_field.isStr() && model_field.getValStr() != "") {
             name += model_field.getValStr();
         }
-        signers.push_back(ExternalSigner(command, fingerprintStr, chain, name));
+        signers.push_back(ExternalSigner(command, chain, fingerprintStr, name));
     }
     return true;
 }
diff --git a/src/external_signer.h b/src/external_signer.h
@@ -21,24 +21,24 @@ class ExternalSigner
     //! The command which handles interaction with the external signer.
     std::string m_command;
 
+    //! Bitcoin mainnet, testnet, etc
+    std::string m_chain;
+
+    const std::string NetworkArg() const;
+
 public:
     //! @param[in] command      the command which handles interaction with the external signer
     //! @param[in] fingerprint  master key fingerprint of the signer
     //! @param[in] chain        "main", "test", "regtest" or "signet"
     //! @param[in] name         device name
-    ExternalSigner(const std::string& command, const std::string& fingerprint, const std::string chain, const std::string name);
+    ExternalSigner(const std::string& command, const std::string chain, const std::string& fingerprint, const std::string name);
 
     //! Master key fingerprint of the signer
     std::string m_fingerprint;
 
-    //! Bitcoin mainnet, testnet, etc
-    std::string m_chain;
-
     //! Name of signer
     std::string m_name;
 
-    const std::string NetworkArg() const;
-
     //! 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

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#include <string>`
`14`	`14`	`#include <vector>`
`15`	`15`
`16`		`-ExternalSigner::ExternalSigner(const std::string& command, const std::string& fingerprint, const std::string chain, const std::string name): m_command(command), m_fingerprint(fingerprint), m_chain(chain), m_name(name) {}`
	`16`	`+ExternalSigner::ExternalSigner(const std::string& command, const std::string chain, const std::string& fingerprint, const std::string name): m_command(command), m_chain(chain), m_fingerprint(fingerprint), m_name(name) {}`
`17`	`17`
`18`	`18`	`const std::string ExternalSigner::NetworkArg() const`
`19`	`19`	`{`
`@@ -53,7 +53,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS`
`53`	`53`	`if (model_field.isStr() && model_field.getValStr() != "") {`
`54`	`54`	`name += model_field.getValStr();`
`55`	`55`	`}`
`56`		`- signers.push_back(ExternalSigner(command, fingerprintStr, chain, name));`
	`56`	`+ signers.push_back(ExternalSigner(command, chain, fingerprintStr, name));`
`57`	`57`	`}`
`58`	`58`	`return true;`
`59`	`59`	`}`