aboutsummaryrefslogtreecommitdiff
path: root/src/test/sighash_tests.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/sighash_tests.cpp')
-rw-r--r--src/test/sighash_tests.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
index 9653edd84b..bc2e3ca45e 100644
--- a/src/test/sighash_tests.cpp
+++ b/src/test/sighash_tests.cpp
@@ -78,8 +78,8 @@ uint256 static SignatureHashOld(CScript scriptCode, const CTransaction& txTo, un
}
// Serialize and hash
- CHashWriter ss{SERIALIZE_TRANSACTION_NO_WITNESS};
- ss << txTmp << nHashType;
+ HashWriter ss{};
+ ss << TX_NO_WITNESS(txTmp) << nHashType;
return ss.GetHash();
}
@@ -138,8 +138,8 @@ BOOST_AUTO_TEST_CASE(sighash_test)
sho = SignatureHashOld(scriptCode, CTransaction(txTo), nIn, nHashType);
sh = SignatureHash(scriptCode, txTo, nIn, nHashType, 0, SigVersion::BASE);
#if defined(PRINT_SIGHASH_JSON)
- CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
- ss << txTo;
+ DataStream ss;
+ ss << TX_WITH_WITNESS(txTo);
std::cout << "\t[\"" ;
std::cout << HexStr(ss) << "\", \"";
@@ -188,8 +188,8 @@ BOOST_AUTO_TEST_CASE(sighash_from_data)
nHashType = test[3].getInt<int>();
sigHashHex = test[4].get_str();
- CDataStream stream(ParseHex(raw_tx), SER_NETWORK, PROTOCOL_VERSION);
- stream >> tx;
+ DataStream stream(ParseHex(raw_tx));
+ stream >> TX_WITH_WITNESS(tx);
TxValidationState state;
BOOST_CHECK_MESSAGE(CheckTransaction(*tx, state), strTest);