Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce template bloat in hex->bin for ZMQ json

This commit is contained in:
Lee Clagett 2019-11-17 04:30:19 +00:00
parent 5fcc23ae0a
commit 3387f0e327
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/serialization/json_object.cpp
View File

@ -1,4 +1,4 @@
// Copyright (c) 2016-2019, The Monero Project // Copyright (c) 2016-2020, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //
@ -32,7 +32,11 @@
#include <boost/variant/apply_visitor.hpp> #include <boost/variant/apply_visitor.hpp>
#include <limits> #include <limits>
#include <type_traits> #include <type_traits>
#include "string_tools.h"
// drop macro from windows.h
#ifdef GetObject
#undef GetObject
#endif
namespace cryptonote namespace cryptonote
{ {
@ -109,6 +113,19 @@ namespace
} }
} }
void read_hex(const rapidjson::Value& val, epee::span<std::uint8_t> dest)
{
if (!val.IsString())
{
throw WRONG_TYPE("string");
}
if (!epee::from_hex::to_buffer(dest, {val.GetString(), val.Size()}))
{
throw BAD_INPUT();
}
}
void toJsonValue(rapidjson::Writer<rapidjson::StringBuffer>& dest, const rapidjson::Value& src) void toJsonValue(rapidjson::Writer<rapidjson::StringBuffer>& dest, const rapidjson::Value& src)
{ {
src.Accept(dest); src.Accept(dest);

21
src/serialization/json_object.h
View File

@ -1,4 +1,4 @@
// Copyright (c) 2016-2019, The Monero Project // Copyright (c) 2016-2020, The Monero Project
// //
// All rights reserved. // All rights reserved.
// //
@ -30,7 +30,6 @@
#include <boost/utility/string_ref.hpp> #include <boost/utility/string_ref.hpp>
#include <cstring> #include <cstring>
#include "string_tools.h" // out of order because windows.h GetObject macro conflicts with GenericValue<..>::GetObject()
#include <rapidjson/document.h> #include <rapidjson/document.h>
#include <rapidjson/stringbuffer.h> #include <rapidjson/stringbuffer.h>
#include <rapidjson/writer.h> #include <rapidjson/writer.h>
@ -39,6 +38,8 @@
#include "rpc/message_data_structs.h" #include "rpc/message_data_structs.h"
#include "cryptonote_protocol/cryptonote_protocol_defs.h" #include "cryptonote_protocol/cryptonote_protocol_defs.h"
#include "common/sfinae_helpers.h" #include "common/sfinae_helpers.h"
#include "hex.h"
#include "span.h"
#define OBJECT_HAS_MEMBER_OR_THROW(val, key) \ #define OBJECT_HAS_MEMBER_OR_THROW(val, key) \
do \ do \
@ -118,6 +119,8 @@ inline constexpr bool is_to_hex()
return std::is_pod<Type>() && !std::is_integral<Type>(); return std::is_pod<Type>() && !std::is_integral<Type>();
} }
void read_hex(const rapidjson::Value& val, epee::span<std::uint8_t> dest);
// POD to json key // POD to json key
template <class Type> template <class Type>
inline typename std::enable_if<is_to_hex<Type>()>::type toJsonKey(rapidjson::Writer<rapidjson::StringBuffer>& dest, const Type& pod) inline typename std::enable_if<is_to_hex<Type>()>::type toJsonKey(rapidjson::Writer<rapidjson::StringBuffer>& dest, const Type& pod)
@ -137,18 +140,8 @@ inline typename std::enable_if<is_to_hex<Type>()>::type toJsonValue(rapidjson::W
template <class Type> template <class Type>
inline typename std::enable_if<is_to_hex<Type>()>::type fromJsonValue(const rapidjson::Value& val, Type& t) inline typename std::enable_if<is_to_hex<Type>()>::type fromJsonValue(const rapidjson::Value& val, Type& t)
{ {
if (!val.IsString()) static_assert(std::is_standard_layout<Type>(), "expected standard layout type");
{ json::read_hex(val, epee::as_mut_byte_span(t));
throw WRONG_TYPE("string");
}
//TODO: handle failure to convert hex string to POD type
bool success = epee::string_tools::hex_to_pod(val.GetString(), t);
if (!success)
{
throw BAD_INPUT();
}
} }
void toJsonValue(rapidjson::Writer<rapidjson::StringBuffer>& dest, const rapidjson::Value& src); void toJsonValue(rapidjson::Writer<rapidjson::StringBuffer>& dest, const rapidjson::Value& src);