diff options
| author | Pieter Wuille <pieter@wuille.net> | 2020-03-11 09:35:39 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2020-03-30 16:10:30 -0700 |
| commit | 2b1f85e8c52c8bc5a17eae4c809eaf61d724af98 (patch) | |
| tree | 76978d88902e6894b4288cf804722b67294d12bd | |
| parent | 73747afbbeb013669faf4c4d2c0903cec4526fb0 (diff) | |
Convert blockencodings_tests to new serialization
| -rw-r--r-- | src/blockencodings.h | 3 | ||||
| -rw-r--r-- | src/test/blockencodings_tests.cpp | 19 |
2 files changed, 3 insertions, 19 deletions
diff --git a/src/blockencodings.h b/src/blockencodings.h index be50166cfc..457ac4508b 100644 --- a/src/blockencodings.h +++ b/src/blockencodings.h @@ -92,12 +92,13 @@ private: friend class PartiallyDownloadedBlock; - static const int SHORTTXIDS_LENGTH = 6; protected: std::vector<uint64_t> shorttxids; std::vector<PrefilledTransaction> prefilledtxn; public: + static constexpr int SHORTTXIDS_LENGTH = 6; + CBlockHeader header; // Dummy for deserialization diff --git a/src/test/blockencodings_tests.cpp b/src/test/blockencodings_tests.cpp index 8694891a51..14cf1a4a76 100644 --- a/src/test/blockencodings_tests.cpp +++ b/src/test/blockencodings_tests.cpp @@ -132,24 +132,7 @@ public: return base.GetShortID(txhash); } - ADD_SERIALIZE_METHODS; - - 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); - } + SERIALIZE_METHODS(TestHeaderAndShortIDs, obj) { READWRITE(obj.header, obj.nonce, Using<VectorFormatter<CustomUintFormatter<CBlockHeaderAndShortTxIDs::SHORTTXIDS_LENGTH>>>(obj.shorttxids), obj.prefilledtxn); } }; BOOST_AUTO_TEST_CASE(NonCoinbasePreforwardRTTest) |