Skip to content

Commit 66545da

Browse files
committed
Remove support for double serialization
1 parent fff1cae commit 66545da

File tree

7 files changed

+0
-43
lines changed

7 files changed

+0
-43
lines changed

src/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ BITCOIN_CORE_H = \
265265
util/tokenpipe.h \
266266
util/trace.h \
267267
util/translation.h \
268-
util/types.h \
269268
util/ui_change_type.h \
270269
util/url.h \
271270
util/vector.h \

src/compat/assumptions.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ static_assert(std::numeric_limits<double>::is_iec559, "IEEE 754 double assumed")
3636
// Example(s): Everywhere :-)
3737
static_assert(std::numeric_limits<unsigned char>::digits == 8, "8-bit byte assumed");
3838

39-
// Assumption: We assume floating-point widths.
40-
// Example(s): Type punning in serialization code (ser_{float,double}_to_uint{32,64}).
41-
static_assert(sizeof(float) == 4, "32-bit float assumed");
42-
static_assert(sizeof(double) == 8, "64-bit double assumed");
43-
4439
// Assumption: We assume integer widths.
4540
// Example(s): GetSizeOfCompactSize and WriteCompactSize in the serialization
4641
// code.

src/serialize.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include <prevector.h>
2525
#include <span.h>
26-
#include <util/types.h>
2726

2827
/**
2928
* The maximum size of a serialized object in bytes or number of elements
@@ -123,20 +122,6 @@ template<typename Stream> inline uint64_t ser_readdata64(Stream &s)
123122
s.read((char*)&obj, 8);
124123
return le64toh(obj);
125124
}
126-
inline uint64_t ser_double_to_uint64(double x)
127-
{
128-
uint64_t tmp;
129-
std::memcpy(&tmp, &x, sizeof(x));
130-
static_assert(sizeof(tmp) == sizeof(x), "double and uint64_t assumed to have the same size");
131-
return tmp;
132-
}
133-
inline double ser_uint64_to_double(uint64_t y)
134-
{
135-
double tmp;
136-
std::memcpy(&tmp, &y, sizeof(y));
137-
static_assert(sizeof(tmp) == sizeof(y), "double and uint64_t assumed to have the same size");
138-
return tmp;
139-
}
140125

141126

142127
/////////////////////////////////////////////////////////////////
@@ -221,8 +206,6 @@ template<typename Stream> inline void Serialize(Stream& s, int32_t a ) { ser_wri
221206
template<typename Stream> inline void Serialize(Stream& s, uint32_t a) { ser_writedata32(s, a); }
222207
template<typename Stream> inline void Serialize(Stream& s, int64_t a ) { ser_writedata64(s, a); }
223208
template<typename Stream> inline void Serialize(Stream& s, uint64_t a) { ser_writedata64(s, a); }
224-
template<typename Stream> inline void Serialize(Stream& s, float a ) { static_assert(ALWAYS_FALSE<Stream>, "Not implemented"); }
225-
template<typename Stream> inline void Serialize(Stream& s, double a ) { ser_writedata64(s, ser_double_to_uint64(a)); }
226209
template<typename Stream, int N> inline void Serialize(Stream& s, const char (&a)[N]) { s.write(a, N); }
227210
template<typename Stream, int N> inline void Serialize(Stream& s, const unsigned char (&a)[N]) { s.write(CharCast(a), N); }
228211
template<typename Stream> inline void Serialize(Stream& s, const Span<const unsigned char>& span) { s.write(CharCast(span.data()), span.size()); }
@@ -239,8 +222,6 @@ template<typename Stream> inline void Unserialize(Stream& s, int32_t& a ) { a =
239222
template<typename Stream> inline void Unserialize(Stream& s, uint32_t& a) { a = ser_readdata32(s); }
240223
template<typename Stream> inline void Unserialize(Stream& s, int64_t& a ) { a = ser_readdata64(s); }
241224
template<typename Stream> inline void Unserialize(Stream& s, uint64_t& a) { a = ser_readdata64(s); }
242-
template<typename Stream> inline void Unserialize(Stream& s, float& a ) { static_assert(ALWAYS_FALSE<Stream>, "Not implemented"); }
243-
template<typename Stream> inline void Unserialize(Stream& s, double& a ) { a = ser_uint64_to_double(ser_readdata64(s)); }
244225
template<typename Stream, int N> inline void Unserialize(Stream& s, char (&a)[N]) { s.read(a, N); }
245226
template<typename Stream, int N> inline void Unserialize(Stream& s, unsigned char (&a)[N]) { s.read(CharCast(a), N); }
246227
template<typename Stream> inline void Unserialize(Stream& s, Span<unsigned char>& span) { s.read(CharCast(span.data()), span.size()); }

src/test/fuzz/float.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <memusage.h>
6-
#include <serialize.h>
7-
#include <streams.h>
86
#include <test/fuzz/FuzzedDataProvider.h>
97
#include <test/fuzz/fuzz.h>
108
#include <util/serfloat.h>
119
#include <version.h>
1210

1311
#include <cassert>
14-
#include <cstdint>
1512
#include <cmath>
1613
#include <limits>
1714

src/test/fuzz/util.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@ void WriteToStream(FuzzedDataProvider& fuzzed_data_provider, Stream& stream) noe
513513
WRITE_TO_STREAM_CASE(uint32_t, fuzzed_data_provider.ConsumeIntegral<uint32_t>()),
514514
WRITE_TO_STREAM_CASE(int64_t, fuzzed_data_provider.ConsumeIntegral<int64_t>()),
515515
WRITE_TO_STREAM_CASE(uint64_t, fuzzed_data_provider.ConsumeIntegral<uint64_t>()),
516-
WRITE_TO_STREAM_CASE(double, fuzzed_data_provider.ConsumeFloatingPoint<double>()),
517516
WRITE_TO_STREAM_CASE(std::string, fuzzed_data_provider.ConsumeRandomLengthString(32)),
518517
WRITE_TO_STREAM_CASE(std::vector<char>, ConsumeRandomLengthIntegralVector<char>(fuzzed_data_provider)));
519518
} catch (const std::ios_base::failure&) {
@@ -544,7 +543,6 @@ void ReadFromStream(FuzzedDataProvider& fuzzed_data_provider, Stream& stream) no
544543
READ_FROM_STREAM_CASE(uint32_t),
545544
READ_FROM_STREAM_CASE(int64_t),
546545
READ_FROM_STREAM_CASE(uint64_t),
547-
READ_FROM_STREAM_CASE(double),
548546
READ_FROM_STREAM_CASE(std::string),
549547
READ_FROM_STREAM_CASE(std::vector<char>));
550548
} catch (const std::ios_base::failure&) {

src/test/serialize_tests.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ BOOST_AUTO_TEST_CASE(sizes)
7070
BOOST_CHECK_EQUAL(sizeof(uint32_t), GetSerializeSize(uint32_t(0), 0));
7171
BOOST_CHECK_EQUAL(sizeof(int64_t), GetSerializeSize(int64_t(0), 0));
7272
BOOST_CHECK_EQUAL(sizeof(uint64_t), GetSerializeSize(uint64_t(0), 0));
73-
BOOST_CHECK_EQUAL(sizeof(double), GetSerializeSize(double(0), 0));
7473
// Bool is serialized as char
7574
BOOST_CHECK_EQUAL(sizeof(char), GetSerializeSize(bool(0), 0));
7675

@@ -84,7 +83,6 @@ BOOST_AUTO_TEST_CASE(sizes)
8483
BOOST_CHECK_EQUAL(GetSerializeSize(uint32_t(0), 0), 4U);
8584
BOOST_CHECK_EQUAL(GetSerializeSize(int64_t(0), 0), 8U);
8685
BOOST_CHECK_EQUAL(GetSerializeSize(uint64_t(0), 0), 8U);
87-
BOOST_CHECK_EQUAL(GetSerializeSize(double(0), 0), 8U);
8886
BOOST_CHECK_EQUAL(GetSerializeSize(bool(0), 0), 1U);
8987
}
9088

src/util/types.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)