aboutsummaryrefslogtreecommitdiff
path: root/src/external_signer.cpp
diff options
context:
space:
mode:
authorMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-05-09 09:25:50 +0200
committerMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-05-09 18:47:14 +0200
commitfa422aeec2909df0151177816dc1ff5eb5a1fbab (patch)
treeced2beb06c5cd34b742925d0e7d9b7ae0a68cbcf /src/external_signer.cpp
parentfa548ac872c094edc94c2afda5cc9b0d84f73af0 (diff)
scripted-diff: Use UniValue::find_value method
-BEGIN VERIFY SCRIPT- sed --regexp-extended -i 's/find_value\(([^ ,]+), /\1.find_value(/g' $(git grep -l find_value) -END VERIFY SCRIPT-
Diffstat (limited to 'src/external_signer.cpp')
-rw-r--r--src/external_signer.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/external_signer.cpp b/src/external_signer.cpp
index 5524b943f4..dc0f7e6046 100644
--- a/src/external_signer.cpp
+++ b/src/external_signer.cpp
@@ -30,7 +30,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
}
for (const UniValue& signer : result.getValues()) {
// Check for error
- const UniValue& error = find_value(signer, "error");
+ const UniValue& error = signer.find_value("error");
if (!error.isNull()) {
if (!error.isStr()) {
throw std::runtime_error(strprintf("'%s' error", command));
@@ -38,7 +38,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
throw std::runtime_error(strprintf("'%s' error: %s", command, error.getValStr()));
}
// Check if fingerprint is present
- const UniValue& fingerprint = find_value(signer, "fingerprint");
+ const UniValue& fingerprint = signer.find_value("fingerprint");
if (fingerprint.isNull()) {
throw std::runtime_error(strprintf("'%s' received invalid response, missing signer fingerprint", command));
}
@@ -50,7 +50,7 @@ bool ExternalSigner::Enumerate(const std::string& command, std::vector<ExternalS
}
if (duplicate) break;
std::string name;
- const UniValue& model_field = find_value(signer, "model");
+ const UniValue& model_field = signer.find_value("model");
if (model_field.isStr() && model_field.getValStr() != "") {
name += model_field.getValStr();
}
@@ -97,19 +97,19 @@ bool ExternalSigner::SignTransaction(PartiallySignedTransaction& psbtx, std::str
const UniValue signer_result = RunCommandParseJSON(command, stdinStr);
- if (find_value(signer_result, "error").isStr()) {
- error = find_value(signer_result, "error").get_str();
+ if (signer_result.find_value("error").isStr()) {
+ error = signer_result.find_value("error").get_str();
return false;
}
- if (!find_value(signer_result, "psbt").isStr()) {
+ if (!signer_result.find_value("psbt").isStr()) {
error = "Unexpected result from signer";
return false;
}
PartiallySignedTransaction signer_psbtx;
std::string signer_psbt_error;
- if (!DecodeBase64PSBT(signer_psbtx, find_value(signer_result, "psbt").get_str(), signer_psbt_error)) {
+ if (!DecodeBase64PSBT(signer_psbtx, signer_result.find_value("psbt").get_str(), signer_psbt_error)) {
error = strprintf("TX decode failed %s", signer_psbt_error);
return false;
}