Skip to content

Commit 06a0673

Browse files
committed
external_signer: remove ignore_errors from Enumerate()
This is undocumented and unused.
1 parent 8fdbb89 commit 06a0673

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

src/external_signer.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,17 @@ const std::string ExternalSigner::NetworkArg() const
2121
return " --chain " + m_chain;
2222
}
2323

24-
bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors)
24+
bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain)
2525
{
2626
// Call <command> enumerate
2727
const UniValue result = RunCommandParseJSON(command + " enumerate");
2828
if (!result.isArray()) {
29-
if (ignore_errors) return false;
3029
throw ExternalSignerException(strprintf("'%s' received invalid response, expected array of signers", command));
3130
}
3231
for (UniValue signer : result.getValues()) {
3332
// Check for error
3433
const UniValue& error = find_value(signer, "error");
3534
if (!error.isNull()) {
36-
if (ignore_errors) return false;
3735
if (!error.isStr()) {
3836
throw ExternalSignerException(strprintf("'%s' error", command));
3937
}
@@ -42,7 +40,6 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
4240
// Check if fingerprint is present
4341
const UniValue& fingerprint = find_value(signer, "fingerprint");
4442
if (fingerprint.isNull()) {
45-
if (ignore_errors) return false;
4643
throw ExternalSignerException(strprintf("'%s' received invalid response, missing signer fingerprint", command));
4744
}
4845
std::string fingerprintStr = fingerprint.get_str();

src/external_signer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class ExternalSigner
5252
//! @param[in,out] signers vector to which new signers (with a unique master key fingerprint) are added
5353
//! @param chain "main", "test", "regtest" or "signet"
5454
//! @returns success
55-
static bool Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors = false);
55+
static bool Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain);
5656

5757
//! Display address on the device. Calls `<command> displayaddress --desc <descriptor>`.
5858
//! @param[in] descriptor Descriptor specifying which address to display.

0 commit comments

Comments
 (0)