diff options
| -rw-r--r-- | src/external_signer.cpp | 5 | ||||
| -rw-r--r-- | src/external_signer.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/external_signer.cpp b/src/external_signer.cpp index 9278d07f49..4809c5abf2 100644 --- a/src/external_signer.cpp +++ b/src/external_signer.cpp @@ -21,19 +21,17 @@ const std::string ExternalSigner::NetworkArg() const return " --chain " + m_chain; } -bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors) +bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain) { // Call <command> enumerate const UniValue result = RunCommandParseJSON(command + " enumerate"); if (!result.isArray()) { - if (ignore_errors) return false; throw ExternalSignerException(strprintf("'%s' received invalid response, expected array of signers", command)); } for (UniValue signer : result.getValues()) { // Check for error const UniValue& error = find_value(signer, "error"); if (!error.isNull()) { - if (ignore_errors) return false; if (!error.isStr()) { throw ExternalSignerException(strprintf("'%s' error", command)); } @@ -42,7 +40,6 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS // Check if fingerprint is present const UniValue& fingerprint = find_value(signer, "fingerprint"); if (fingerprint.isNull()) { - if (ignore_errors) return false; throw ExternalSignerException(strprintf("'%s' received invalid response, missing signer fingerprint", command)); } std::string fingerprintStr = fingerprint.get_str(); diff --git a/src/external_signer.h b/src/external_signer.h index 070589dac0..02946b22a9 100644 --- a/src/external_signer.h +++ b/src/external_signer.h @@ -52,7 +52,7 @@ public: //! @param[in,out] signers vector to which new signers (with a unique master key fingerprint) are added //! @param chain "main", "test", "regtest" or "signet" //! @returns success - static bool Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain, bool ignore_errors = false); + static bool Enumerate(const std::string& command, std::vector<ExternalSigner>& signers, std::string chain); //! Display address on the device. Calls `<command> displayaddress --desc <descriptor>`. //! @param[in] descriptor Descriptor specifying which address to display. |