highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 06:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: SpanReader without nVersion

Browse Source 
The field is unused, so remove it.

This is also required for future commits.
This commit is contained in:
MarcoFalke
2023-11-17 16:32:29 +01:00
parent c252a0fc0f
commit fac39b56b7
9 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/script_tests.cpp
View File

@@ -1470,7 +1470,7 @@ BOOST_AUTO_TEST_CASE(script_HasValidOps)
static CMutableTransaction TxFromHex(const std::string& str)
{
CMutableTransaction tx;
SpanReader{0, ParseHex(str)} >> TX_NO_WITNESS(tx);
SpanReader{ParseHex(str)} >> TX_NO_WITNESS(tx);
return tx;
}
@@ -1480,7 +1480,7 @@ static std::vector<CTxOut> TxOutsFromJSON(const UniValue& univalue)
std::vector<CTxOut> prevouts;
for (size_t i = 0; i < univalue.size(); ++i) {
CTxOut txout;
SpanReader{0, ParseHex(univalue[i].get_str())} >> txout;
SpanReader{ParseHex(univalue[i].get_str())} >> txout;
prevouts.push_back(std::move(txout));
}
return prevouts;
@@ -1816,7 +1816,7 @@ BOOST_AUTO_TEST_CASE(bip341_keypath_test_vectors)
for (const auto& vec : vectors.getValues()) {
auto txhex = ParseHex(vec["given"]["rawUnsignedTx"].get_str());
CMutableTransaction tx;
SpanReader{PROTOCOL_VERSION, txhex} >> TX_WITH_WITNESS(tx);
SpanReader{txhex} >> TX_WITH_WITNESS(tx);
std::vector<CTxOut> utxos;
for (const auto& utxo_spent : vec["given"]["utxosSpent"].getValues()) {
auto script_bytes = ParseHex(utxo_spent["scriptPubKey"].get_str());