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

8
src/test/script_tests.cpp Normal file → Executable file
View file

@ -1685,7 +1685,7 @@ static void AssetTest(const UniValue& test)
const std::vector<CTxOut> prevouts = TxOutsFromJSON(test["prevouts"]);
BOOST_CHECK(prevouts.size() == mtx.vin.size());
mtx.witness.vtxinwit.resize(mtx.vin.size());
size_t idx = test["index"].get_int64();
size_t idx = test["index"].getInt<int64_t>();
uint32_t test_flags{ParseScriptFlags(test["flags"].get_str())};
bool fin = test.exists("final") && test["final"].get_bool();
// ELEMENTS: feature_taproot.py --dumptests outputs this field
@ -1774,7 +1774,7 @@ BOOST_AUTO_TEST_CASE(bip341_keypath_test_vectors)
for (const auto& utxo_spent : vec["given"]["utxosSpent"].getValues()) {
auto script_bytes = ParseHex(utxo_spent["scriptPubKey"].get_str());
CScript script{script_bytes.begin(), script_bytes.end()};
CAmount amount{utxo_spent["amountSats"].get_int()};
CAmount amount{utxo_spent["amountSats"].getInt<int>()};
utxos.emplace_back(CAsset(), amount, script);
}
@ -1794,8 +1794,8 @@ BOOST_AUTO_TEST_CASE(bip341_keypath_test_vectors)
BOOST_CHECK_EQUAL(HexStr(txdata.m_sequences_single_hash), vec["intermediary"]["hashSequences"].get_str());
for (const auto& input : vec["inputSpending"].getValues()) {
int txinpos = input["given"]["txinIndex"].get_int();
int hashtype = input["given"]["hashType"].get_int();
int txinpos = input["given"]["txinIndex"].getInt<int>();
int hashtype = input["given"]["hashType"].getInt<int>();
// Load key.
auto privkey = ParseHex(input["given"]["internalPrivkey"].get_str());