diff options
| author | Sjors Provoost <sjors@sprovoost.nl> | 2021-06-15 16:58:55 +0200 |
|---|---|---|
| committer | Sjors Provoost <sjors@sprovoost.nl> | 2021-06-16 10:48:58 +0200 |
| commit | d672404466204444a1d9f2d3498de4448f53d2be (patch) | |
| tree | 3e29dfb437f1463d83a3d9483b3855ebdce45574 | |
| parent | 4455145e266450397b45acd7286686966edd072b (diff) | |
| download | bitcoin-d672404466204444a1d9f2d3498de4448f53d2be.tar.xz | |
refactor: make ExternalSigner NetworkArg() and m_chain private
| -rw-r--r-- | src/external_signer.cpp | 4 | ||||
| -rw-r--r-- | src/external_signer.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/external_signer.cpp b/src/external_signer.cpp index b2bd7cb261..d6388b759a 100644 --- 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 index c4f723a1bb..e40fd7f010 100644 --- a/src/external_signer.h +++ b/src/external_signer.h @@ -21,24 +21,24 @@ private: //! 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 |