highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-21 14:22:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert blockencodings_tests to new serialization

Browse Source
This commit is contained in:
Pieter Wuille 2020-03-11 09:35:39 -07:00
parent 73747afbbe
commit 2b1f85e8c5
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/blockencodings.h
View File

@ -92,12 +92,13 @@ private:
friend class PartiallyDownloadedBlock; friend class PartiallyDownloadedBlock;
static const int SHORTTXIDS_LENGTH = 6;
protected: protected:
std::vector<uint64_t> shorttxids; std::vector<uint64_t> shorttxids;
std::vector<PrefilledTransaction> prefilledtxn; std::vector<PrefilledTransaction> prefilledtxn;
public: public:
static constexpr int SHORTTXIDS_LENGTH = 6;
CBlockHeader header; CBlockHeader header;
// Dummy for deserialization // Dummy for deserialization

19
src/test/blockencodings_tests.cpp
View File

@ -132,24 +132,7 @@ public:
return base.GetShortID(txhash); return base.GetShortID(txhash);
} }
ADD_SERIALIZE_METHODS; SERIALIZE_METHODS(TestHeaderAndShortIDs, obj) { READWRITE(obj.header, obj.nonce, Using<VectorFormatter<CustomUintFormatter<CBlockHeaderAndShortTxIDs::SHORTTXIDS_LENGTH>>>(obj.shorttxids), obj.prefilledtxn); }
template <typename Stream, typename Operation>
inline void SerializationOp(Stream& s, Operation ser_action) {
READWRITE(header);
READWRITE(nonce);
size_t shorttxids_size = shorttxids.size();
READWRITE(VARINT(shorttxids_size));
shorttxids.resize(shorttxids_size);
for (size_t i = 0; i < shorttxids.size(); i++) {
uint32_t lsb = shorttxids[i] & 0xffffffff;
uint16_t msb = (shorttxids[i] >> 32) & 0xffff;
READWRITE(lsb);
READWRITE(msb);
shorttxids[i] = (uint64_t(msb) << 32) | uint64_t(lsb);
}
READWRITE(prefilledtxn);
}
}; };
BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest) BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest)