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

Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153)

Browse source
This commit is contained in:
James Dorfman 2024-08-13 06:00:38 +00:00
commit 06a6044137
32 changed files with 115 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/script_standard_tests.cpp
View file

@ -406,8 +406,8 @@ BOOST_AUTO_TEST_CASE(bip341_spk_test_vectors)
if (node.isObject()) {
auto script_bytes = ParseHex(node["script"].get_str());
CScript script(script_bytes.begin(), script_bytes.end());
int idx = node["id"].get_int();
int leaf_version = node["leafVersion"].get_int();
int idx = node["id"].getInt<int>();
int leaf_version = node["leafVersion"].getInt<int>();
scriptposes[{script, leaf_version}] = idx;
spktest.Add(depth, script, leaf_version);
} else {