mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-26 19:23:26 -03:00
kernel: move RunCommandParseJSON to its own file
Because libbitcoinkernel does not include this new object, this has the side-effect of eliminating the unnecessary boost::process dependency.
This commit is contained in:
parent
b2da6dd943
commit
192325a77d
7 changed files with 89 additions and 61 deletions
|
@ -284,6 +284,7 @@ BITCOIN_CORE_H = \
|
||||||
util/rbf.h \
|
util/rbf.h \
|
||||||
util/readwritefile.h \
|
util/readwritefile.h \
|
||||||
util/result.h \
|
util/result.h \
|
||||||
|
util/run_command.h \
|
||||||
util/serfloat.h \
|
util/serfloat.h \
|
||||||
util/settings.h \
|
util/settings.h \
|
||||||
util/sock.h \
|
util/sock.h \
|
||||||
|
@ -680,6 +681,7 @@ libbitcoin_util_a_SOURCES = \
|
||||||
util/fees.cpp \
|
util/fees.cpp \
|
||||||
util/getuniquepath.cpp \
|
util/getuniquepath.cpp \
|
||||||
util/hasher.cpp \
|
util/hasher.cpp \
|
||||||
|
util/run_command.cpp \
|
||||||
util/sock.cpp \
|
util/sock.cpp \
|
||||||
util/syserror.cpp \
|
util/syserror.cpp \
|
||||||
util/system.cpp \
|
util/system.cpp \
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
#include <chainparams.h>
|
#include <chainparams.h>
|
||||||
#include <core_io.h>
|
#include <core_io.h>
|
||||||
#include <psbt.h>
|
#include <psbt.h>
|
||||||
|
#include <util/run_command.h>
|
||||||
#include <util/strencodings.h>
|
#include <util/strencodings.h>
|
||||||
#include <util/system.h>
|
|
||||||
#include <external_signer.h>
|
#include <external_signer.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
//
|
//
|
||||||
#include <test/util/setup_common.h>
|
#include <test/util/setup_common.h>
|
||||||
#include <util/system.h>
|
#include <util/run_command.h>
|
||||||
#include <univalue.h>
|
#include <univalue.h>
|
||||||
|
|
||||||
#ifdef ENABLE_EXTERNAL_SIGNER
|
#ifdef ENABLE_EXTERNAL_SIGNER
|
||||||
|
|
64
src/util/run_command.cpp
Normal file
64
src/util/run_command.cpp
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
// Copyright (c) 2022 The Bitcoin Core developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#if defined(HAVE_CONFIG_H)
|
||||||
|
#include <config/bitcoin-config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <util/run_command.h>
|
||||||
|
|
||||||
|
#include <tinyformat.h>
|
||||||
|
#include <univalue.h>
|
||||||
|
|
||||||
|
#ifdef ENABLE_EXTERNAL_SIGNER
|
||||||
|
#if defined(__GNUC__)
|
||||||
|
// Boost 1.78 requires the following workaround.
|
||||||
|
// See: https://github.com/boostorg/process/issues/235
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wnarrowing"
|
||||||
|
#endif
|
||||||
|
#include <boost/process.hpp>
|
||||||
|
#if defined(__GNUC__)
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
#endif // ENABLE_EXTERNAL_SIGNER
|
||||||
|
|
||||||
|
UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
|
||||||
|
{
|
||||||
|
#ifdef ENABLE_EXTERNAL_SIGNER
|
||||||
|
namespace bp = boost::process;
|
||||||
|
|
||||||
|
UniValue result_json;
|
||||||
|
bp::opstream stdin_stream;
|
||||||
|
bp::ipstream stdout_stream;
|
||||||
|
bp::ipstream stderr_stream;
|
||||||
|
|
||||||
|
if (str_command.empty()) return UniValue::VNULL;
|
||||||
|
|
||||||
|
bp::child c(
|
||||||
|
str_command,
|
||||||
|
bp::std_out > stdout_stream,
|
||||||
|
bp::std_err > stderr_stream,
|
||||||
|
bp::std_in < stdin_stream
|
||||||
|
);
|
||||||
|
if (!str_std_in.empty()) {
|
||||||
|
stdin_stream << str_std_in << std::endl;
|
||||||
|
}
|
||||||
|
stdin_stream.pipe().close();
|
||||||
|
|
||||||
|
std::string result;
|
||||||
|
std::string error;
|
||||||
|
std::getline(stdout_stream, result);
|
||||||
|
std::getline(stderr_stream, error);
|
||||||
|
|
||||||
|
c.wait();
|
||||||
|
const int n_error = c.exit_code();
|
||||||
|
if (n_error) throw std::runtime_error(strprintf("RunCommandParseJSON error: process(%s) returned %d: %s\n", str_command, n_error, error));
|
||||||
|
if (!result_json.read(result)) throw std::runtime_error("Unable to parse JSON: " + result);
|
||||||
|
|
||||||
|
return result_json;
|
||||||
|
#else
|
||||||
|
throw std::runtime_error("Compiled without external signing support (required for external signing).");
|
||||||
|
#endif // ENABLE_EXTERNAL_SIGNER
|
||||||
|
}
|
21
src/util/run_command.h
Normal file
21
src/util/run_command.h
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
// Copyright (c) 2022 The Bitcoin Core developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#ifndef BITCOIN_UTIL_RUN_COMMAND_H
|
||||||
|
#define BITCOIN_UTIL_RUN_COMMAND_H
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
class UniValue;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute a command which returns JSON, and parse the result.
|
||||||
|
*
|
||||||
|
* @param str_command The command to execute, including any arguments
|
||||||
|
* @param str_std_in string to pass to stdin
|
||||||
|
* @return parsed JSON
|
||||||
|
*/
|
||||||
|
UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in="");
|
||||||
|
|
||||||
|
#endif // BITCOIN_UTIL_RUN_COMMAND_H
|
|
@ -5,19 +5,6 @@
|
||||||
|
|
||||||
#include <util/system.h>
|
#include <util/system.h>
|
||||||
|
|
||||||
#ifdef ENABLE_EXTERNAL_SIGNER
|
|
||||||
#if defined(__GNUC__)
|
|
||||||
// Boost 1.78 requires the following workaround.
|
|
||||||
// See: https://github.com/boostorg/process/issues/235
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Wnarrowing"
|
|
||||||
#endif
|
|
||||||
#include <boost/process.hpp>
|
|
||||||
#if defined(__GNUC__)
|
|
||||||
#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
#endif // ENABLE_EXTERNAL_SIGNER
|
|
||||||
|
|
||||||
#include <chainparamsbase.h>
|
#include <chainparamsbase.h>
|
||||||
#include <fs.h>
|
#include <fs.h>
|
||||||
#include <sync.h>
|
#include <sync.h>
|
||||||
|
@ -1332,44 +1319,6 @@ void runCommand(const std::string& strCommand)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in)
|
|
||||||
{
|
|
||||||
#ifdef ENABLE_EXTERNAL_SIGNER
|
|
||||||
namespace bp = boost::process;
|
|
||||||
|
|
||||||
UniValue result_json;
|
|
||||||
bp::opstream stdin_stream;
|
|
||||||
bp::ipstream stdout_stream;
|
|
||||||
bp::ipstream stderr_stream;
|
|
||||||
|
|
||||||
if (str_command.empty()) return UniValue::VNULL;
|
|
||||||
|
|
||||||
bp::child c(
|
|
||||||
str_command,
|
|
||||||
bp::std_out > stdout_stream,
|
|
||||||
bp::std_err > stderr_stream,
|
|
||||||
bp::std_in < stdin_stream
|
|
||||||
);
|
|
||||||
if (!str_std_in.empty()) {
|
|
||||||
stdin_stream << str_std_in << std::endl;
|
|
||||||
}
|
|
||||||
stdin_stream.pipe().close();
|
|
||||||
|
|
||||||
std::string result;
|
|
||||||
std::string error;
|
|
||||||
std::getline(stdout_stream, result);
|
|
||||||
std::getline(stderr_stream, error);
|
|
||||||
|
|
||||||
c.wait();
|
|
||||||
const int n_error = c.exit_code();
|
|
||||||
if (n_error) throw std::runtime_error(strprintf("RunCommandParseJSON error: process(%s) returned %d: %s\n", str_command, n_error, error));
|
|
||||||
if (!result_json.read(result)) throw std::runtime_error("Unable to parse JSON: " + result);
|
|
||||||
|
|
||||||
return result_json;
|
|
||||||
#else
|
|
||||||
throw std::runtime_error("Compiled without external signing support (required for external signing).");
|
|
||||||
#endif // ENABLE_EXTERNAL_SIGNER
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetupEnvironment()
|
void SetupEnvironment()
|
||||||
{
|
{
|
||||||
|
|
|
@ -107,14 +107,6 @@ std::string ShellEscape(const std::string& arg);
|
||||||
#if HAVE_SYSTEM
|
#if HAVE_SYSTEM
|
||||||
void runCommand(const std::string& strCommand);
|
void runCommand(const std::string& strCommand);
|
||||||
#endif
|
#endif
|
||||||
/**
|
|
||||||
* Execute a command which returns JSON, and parse the result.
|
|
||||||
*
|
|
||||||
* @param str_command The command to execute, including any arguments
|
|
||||||
* @param str_std_in string to pass to stdin
|
|
||||||
* @return parsed JSON
|
|
||||||
*/
|
|
||||||
UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in="");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Most paths passed as configuration arguments are treated as relative to
|
* Most paths passed as configuration arguments are treated as relative to
|
||||||
|
|
Loading…
Add table
Reference in a new issue