diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2020-02-03 19:49:10 -0800 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2020-02-14 19:22:39 -0800 |
commit | 3ca574cef0b4423f21b2c3efd8f5c9f71d52f219 (patch) | |
tree | 1fa046d2fb7193492dacb4ab27456bd096654440 /src | |
parent | 0c20809da85ac708386fa1ca80f7242917f90761 (diff) | |
download | bitcoin-3ca574cef0b4423f21b2c3efd8f5c9f71d52f219.tar.xz |
Convert CCompactSize to proper formatter
Diffstat (limited to 'src')
-rw-r--r-- | src/serialize.h | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/serialize.h b/src/serialize.h index cee7225bcb..e0e29bcf4a 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -495,7 +495,7 @@ static inline Wrapper<Formatter, T&> Using(T&& t) { return Wrapper<Formatter, T& #define VARINT_MODE(obj, mode) Using<VarIntFormatter<mode>>(obj) #define VARINT(obj) Using<VarIntFormatter<VarIntMode::DEFAULT>>(obj) -#define COMPACTSIZE(obj) CCompactSize(REF(obj)) +#define COMPACTSIZE(obj) Using<CompactSizeFormatter>(obj) #define LIMITED_STRING(obj,n) LimitedString< n >(REF(obj)) /** Serialization wrapper class for integers in VarInt format. */ @@ -547,21 +547,26 @@ public: } }; -class CCompactSize +/** Formatter for integers in CompactSize format. */ +struct CompactSizeFormatter { -protected: - uint64_t &n; -public: - explicit CCompactSize(uint64_t& nIn) : n(nIn) { } - - template<typename Stream> - void Serialize(Stream &s) const { - WriteCompactSize<Stream>(s, n); + template<typename Stream, typename I> + void Unser(Stream& s, I& v) + { + uint64_t n = ReadCompactSize<Stream>(s); + if (n < std::numeric_limits<I>::min() || n > std::numeric_limits<I>::max()) { + throw std::ios_base::failure("CompactSize exceeds limit of type"); + } + v = n; } - template<typename Stream> - void Unserialize(Stream& s) { - n = ReadCompactSize<Stream>(s); + template<typename Stream, typename I> + void Ser(Stream& s, I v) + { + static_assert(std::is_unsigned<I>::value, "CompactSize only supported for unsigned integers"); + static_assert(std::numeric_limits<I>::max() <= std::numeric_limits<uint64_t>::max(), "CompactSize only supports 64-bit integers and below"); + + WriteCompactSize<Stream>(s, v); } }; |