Convert LimitedString to formatter

sipa · sipa · commit 92beff15d3ae · 2020-05-24T10:35:00.000-07:00
diff --git a/src/serialize.h b/src/serialize.h
@@ -503,7 +503,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) Using<CompactSizeFormatter>(obj)
-#define LIMITED_STRING(obj,n) LimitedString< n >(REF(obj))
+#define LIMITED_STRING(obj,n) Using<LimitedStringFormatter<n>>(obj)
 
 /** Serialization wrapper class for integers in VarInt format. */
 template<VarIntMode Mode>
@@ -588,31 +588,23 @@ struct CompactSizeFormatter
 };
 
 template<size_t Limit>
-class LimitedString
+struct LimitedStringFormatter
 {
-protected:
-    std::string& string;
-public:
-    explicit LimitedString(std::string& _string) : string(_string) {}
-
     template<typename Stream>
-    void Unserialize(Stream& s)
+    void Unser(Stream& s, std::string& v)
     {
         size_t size = ReadCompactSize(s);
         if (size > Limit) {
             throw std::ios_base::failure("String length limit exceeded");
         }
-        string.resize(size);
-        if (size != 0)
-            s.read((char*)string.data(), size);
+        v.resize(size);
+        if (size != 0) s.read((char*)v.data(), size);
     }
 
     template<typename Stream>
-    void Serialize(Stream& s) const
+    void Ser(Stream& s, const std::string& v)
     {
-        WriteCompactSize(s, string.size());
-        if (!string.empty())
-            s.write((char*)string.data(), string.size());
+        s << v;
     }
 };
 
diff --git a/src/test/fuzz/string.cpp b/src/test/fuzz/string.cpp
@@ -93,7 +93,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     {
         CDataStream data_stream{SER_NETWORK, INIT_PROTO_VERSION};
         std::string s;
-        LimitedString<10> limited_string = LIMITED_STRING(s, 10);
+        auto limited_string = LIMITED_STRING(s, 10);
         data_stream << random_string_1;
         try {
             data_stream >> limited_string;
@@ -108,7 +108,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     }
     {
         CDataStream data_stream{SER_NETWORK, INIT_PROTO_VERSION};
-        const LimitedString<10> limited_string = LIMITED_STRING(random_string_1, 10);
+        const auto limited_string = LIMITED_STRING(random_string_1, 10);
         data_stream << limited_string;
         std::string deserialized_string;
         data_stream >> deserialized_string;

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)`
`93`	`93`	`{`
`94`	`94`	`CDataStream data_stream{SER_NETWORK, INIT_PROTO_VERSION};`
`95`	`95`	`std::string s;`
`96`		`- LimitedString<10> limited_string = LIMITED_STRING(s, 10);`
	`96`	`+ auto limited_string = LIMITED_STRING(s, 10);`
`97`	`97`	`data_stream << random_string_1;`
`98`	`98`	`try {`
`99`	`99`	`data_stream >> limited_string;`
`@@ -108,7 +108,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)`
`108`	`108`	`}`
`109`	`109`	`{`
`110`	`110`	`CDataStream data_stream{SER_NETWORK, INIT_PROTO_VERSION};`
`111`		`- const LimitedString<10> limited_string = LIMITED_STRING(random_string_1, 10);`
	`111`	`+ const auto limited_string = LIMITED_STRING(random_string_1, 10);`
`112`	`112`	`data_stream << limited_string;`
`113`	`113`	`std::string deserialized_string;`
`114`	`114`	`data_stream >> deserialized_string;`