Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-03 11:26:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Change ZMQ-JSON txextra to hex and remove unnecessary base fields

Browse source
This commit is contained in:
Lee Clagett 2020-05-31 01:22:33 -04:00
parent 7e78da7772
commit 4e2377995d
5 changed files with 48 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/serialization/json_object.h
View file

@ -153,6 +153,9 @@ inline void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const std::s
}
void fromJsonValue(const rapidjson::Value& val, std::string& str);
void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const std::vector<std::uint8_t>&);
void fromJsonValue(const rapidjson::Value& src, std::vector<std::uint8_t>& i);
void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, bool i);
void fromJsonValue(const rapidjson::Value& val, bool& b);
@ -353,6 +356,10 @@ inline typename std::enable_if<sfinae::is_map_like<Map>::value, void>::type from
template <typename Vec>
inline typename std::enable_if<sfinae::is_vector_like<Vec>::value, void>::type toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const Vec &vec)
{
using value_type = typename Vec::value_type;
static_assert(!std::is_same<value_type, char>::value, "encoding an array of chars is faster as hex");
static_assert(!std::is_same<value_type, unsigned char>::value, "encoding an array of unsigned char is faster as hex");
dest.StartArray();
for (const auto& t : vec)
toJsonValue(dest, t);
@ -362,6 +369,10 @@ inline typename std::enable_if<sfinae::is_vector_like<Vec>::value, void>::type t
template <typename Vec>
inline typename std::enable_if<sfinae::is_vector_like<Vec>::value, void>::type fromJsonValue(const rapidjson::Value& val, Vec& vec)
{
using value_type = typename Vec::value_type;
static_assert(!std::is_same<value_type, char>::value, "encoding a vector of chars is faster as hex");
static_assert(!std::is_same<value_type, unsigned char>::value, "encoding a vector of unsigned char is faster as hex");
if (!val.IsArray())
{
throw WRONG_TYPE("json array");