diff options
| author | fanquake <fanquake@gmail.com> | 2023-02-01 11:36:49 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-02-01 11:43:42 +0000 |
| commit | 17acbc1a5a8d07ad30fc0ef4a726097f5cf9e168 (patch) | |
| tree | 0d6ec693c011d235bf19888eb48df3adc550f496 /src/test/script_tests.cpp | |
| parent | e1bf5470f919cf212703466411968916db8ae61f (diff) | |
| parent | 7a820cee0e6408f5848799011d82dd29ee7fa8c5 (diff) | |
Merge bitcoin/bitcoin#25974: test, build: Separate `read_json` function into its own module
7a820cee0e6408f5848799011d82dd29ee7fa8c5 test, build: Separate `read_json` function into its own module (Hennadii Stepanov)
Pull request description:
Currently, 4 source files rely on the definition of the `read_json` function provided in `src/test/script_tests.cpp`.
This PR breaks this entanglement, improves code structure and maintainability.
ACKs for top commit:
fanquake:
ACK 7a820cee0e6408f5848799011d82dd29ee7fa8c5
Tree-SHA512: f1567989f76cb54ab86cc48927851a8c424b08a9483d02d4918b629e0c792108bad4ccf7fa341d57b0921d91e84bf8fa3b9c07e5fdf12c64d9d5da83e4e464fb
Diffstat (limited to 'src/test/script_tests.cpp')
| -rw-r--r-- | src/test/script_tests.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index d4cede8f7c..22f6cfd164 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -15,6 +15,7 @@ #include <script/sign.h> #include <script/signingprovider.h> #include <streams.h> +#include <test/util/json.h> #include <test/util/setup_common.h> #include <test/util/transaction_utils.h> #include <util/strencodings.h> @@ -41,18 +42,6 @@ static const unsigned int gFlags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC; unsigned int ParseScriptFlags(std::string strFlags); std::string FormatScriptFlags(unsigned int flags); -UniValue read_json(const std::string& jsondata) -{ - UniValue v; - - if (!v.read(jsondata) || !v.isArray()) - { - BOOST_ERROR("Parse error."); - return UniValue(UniValue::VARR); - } - return v.get_array(); -} - struct ScriptErrorDesc { ScriptError_t err; |