mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-10 22:18:54 +01:00
Use ParamsWrapper for witness serialization
This commit is contained in:
@@ -36,7 +36,7 @@ public:
|
||||
READWRITE(obj.boolval);
|
||||
READWRITE(obj.stringval);
|
||||
READWRITE(obj.charstrval);
|
||||
READWRITE(obj.txval);
|
||||
READWRITE(TX_WITH_WITNESS(obj.txval));
|
||||
}
|
||||
|
||||
bool operator==(const CSerializeMethodsTestSingle& rhs) const
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
|
||||
SERIALIZE_METHODS(CSerializeMethodsTestMany, obj)
|
||||
{
|
||||
READWRITE(obj.intval, obj.boolval, obj.stringval, obj.charstrval, obj.txval);
|
||||
READWRITE(obj.intval, obj.boolval, obj.stringval, obj.charstrval, TX_WITH_WITNESS(obj.txval));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -228,7 +228,7 @@ BOOST_AUTO_TEST_CASE(class_methods)
|
||||
CSerializeMethodsTestMany methodtest2(intval, boolval, stringval, charstrval, tx_ref);
|
||||
CSerializeMethodsTestSingle methodtest3;
|
||||
CSerializeMethodsTestMany methodtest4;
|
||||
CDataStream ss(SER_DISK, PROTOCOL_VERSION);
|
||||
DataStream ss;
|
||||
BOOST_CHECK(methodtest1 == methodtest2);
|
||||
ss << methodtest1;
|
||||
ss >> methodtest4;
|
||||
@@ -238,8 +238,8 @@ BOOST_AUTO_TEST_CASE(class_methods)
|
||||
BOOST_CHECK(methodtest2 == methodtest3);
|
||||
BOOST_CHECK(methodtest3 == methodtest4);
|
||||
|
||||
CDataStream ss2{SER_DISK, PROTOCOL_VERSION};
|
||||
ss2 << intval << boolval << stringval << charstrval << txval;
|
||||
DataStream ss2;
|
||||
ss2 << intval << boolval << stringval << charstrval << TX_WITH_WITNESS(txval);
|
||||
ss2 >> methodtest3;
|
||||
BOOST_CHECK(methodtest3 == methodtest4);
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user