highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 14:08:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

external_signer: remove ExternalSignerException

Browse Source 
It's not clear why this need it's own exception class, as opposed to just
throwing std::runtime_error().
This commit is contained in:
fanquake
2021-04-13 19:55:59 +08:00
parent 9e0b199b97
commit c8f469c6d5
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/external_signer.cpp
View File

@@ -9,6 +9,7 @@
#include <util/system.h>
#include <external_signer.h>
#include <stdexcept>
#include <string>
#include <vector>
@@ -26,21 +27,21 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
// Call <command> enumerate
const UniValue result = RunCommandParseJSON(command + " enumerate");
if (!result.isArray()) {
throw ExternalSignerException(strprintf("'%s' received invalid response, expected array of signers", command));
throw std::runtime_error(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 (!error.isStr()) {
throw ExternalSignerException(strprintf("'%s' error", command));
throw std::runtime_error(strprintf("'%s' error", command));
}
throw ExternalSignerException(strprintf("'%s' error: %s", command, error.getValStr()));
throw std::runtime_error(strprintf("'%s' error: %s", command, error.getValStr()));
}
// Check if fingerprint is present
const UniValue& fingerprint = find_value(signer, "fingerprint");
if (fingerprint.isNull()) {
throw ExternalSignerException(strprintf("'%s' received invalid response, missing signer fingerprint", command));
throw std::runtime_error(strprintf("'%s' received invalid response, missing signer fingerprint", command));
}
const std::string fingerprintStr = fingerprint.get_str();
// Skip duplicate signer