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

Merge 21138fe377 into merged_master (Bitcoin PR bitcoin/bitcoin#26992)

Browse source
This commit is contained in:
Byron Hambly 2025-04-05 11:36:18 +02:00
commit cb56685c36
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/streams.h
View file

@ -358,14 +358,6 @@ public:
nType{nTypeIn},
nVersion{nVersionIn} {}
template <typename... Args>
CDataStream(int nTypeIn, int nVersionIn, Args&&... args)
: nType{nTypeIn},
nVersion{nVersionIn}
{
::SerializeMany(*this, std::forward<Args>(args)...);
}
int GetType() const { return nType; }
void SetVersion(int n) { nVersion = n; }
int GetVersion() const { return nVersion; }

3
src/test/serialize_tests.cpp
View file

@ -237,7 +237,8 @@ BOOST_AUTO_TEST_CASE(class_methods)
BOOST_CHECK(methodtest2 == methodtest3);
BOOST_CHECK(methodtest3 == methodtest4);
CDataStream ss2(SER_DISK, PROTOCOL_VERSION, intval, boolval, stringval, charstrval, txval);
CDataStream ss2{SER_DISK, PROTOCOL_VERSION};
ss2 << intval << boolval << stringval << charstrval << txval;
ss2 >> methodtest3;
BOOST_CHECK(methodtest3 == methodtest4);
}