Skip to content

Commit d672404

Browse files
committed
refactor: make ExternalSigner NetworkArg() and m_chain private
1 parent 4455145 commit d672404

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/external_signer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <string>
1414
#include <vector>
1515

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) {}
1717

1818
const std::string ExternalSigner::NetworkArg() const
1919
{
@@ -53,7 +53,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
5353
if (model_field.isStr() && model_field.getValStr() != "") {
5454
name += model_field.getValStr();
5555
}
56-
signers.push_back(ExternalSigner(command, fingerprintStr, chain, name));
56+
signers.push_back(ExternalSigner(command, chain, fingerprintStr, name));
5757
}
5858
return true;
5959
}

src/external_signer.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@ class ExternalSigner
2121
//! The command which handles interaction with the external signer.
2222
std::string m_command;
2323

24+
//! Bitcoin mainnet, testnet, etc
25+
std::string m_chain;
26+
27+
const std::string NetworkArg() const;
28+
2429
public:
2530
//! @param[in] command the command which handles interaction with the external signer
2631
//! @param[in] fingerprint master key fingerprint of the signer
2732
//! @param[in] chain "main", "test", "regtest" or "signet"
2833
//! @param[in] name device name
29-
ExternalSigner(const std::string& command, const std::string& fingerprint, const std::string chain, const std::string name);
34+
ExternalSigner(const std::string& command, const std::string chain, const std::string& fingerprint, const std::string name);
3035

3136
//! Master key fingerprint of the signer
3237
std::string m_fingerprint;
3338

34-
//! Bitcoin mainnet, testnet, etc
35-
std::string m_chain;
36-
3739
//! Name of signer
3840
std::string m_name;
3941

40-
const std::string NetworkArg() const;
41-
4242
//! Obtain a list of signers. Calls `<command> enumerate`.
4343
//! @param[in] command the command which handles interaction with the external signer
4444
//! @param[in,out] signers vector to which new signers (with a unique master key fingerprint) are added

0 commit comments

Comments
 (0)