GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 4a26705761 into merged_master (Bitcoin PR bitcoin/bitcoin#21902)

Browse source
This commit is contained in:
Andrew Poelstra 2021-07-09 00:08:06 +00:00
commit 9ea813efb8
6 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/test/script_tests.cpp
View file

@ -39,8 +39,7 @@ 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 read_json(const std::string& jsondata)
{
UniValue v;