Builds/wownero-lws
1
0
Fork 0
forked from such-gitea/wownero-lws
Code Pull Requests Actions Activity

Update ::wire:: to be closer to Monero variant (#70)

Browse Source
This commit is contained in:
Lee *!* Clagett
2023-06-07 09:01:46 -04:00
committed by Lee *!* Clagett
parent 3e0555e07d
commit e1bd9541f1
36 changed files with 992 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/wire/json/write.h
View File

@@ -60,15 +60,15 @@ namespace wire
void check_flush();
protected:
json_writer(bool needs_flush)
: writer(), bytes_(), formatter_(bytes_), needs_flush_(needs_flush)
json_writer(epee::byte_stream&& out, bool needs_flush)
: writer(), bytes_(std::move(out)), formatter_(bytes_), needs_flush_(needs_flush)
{}
//! \throw std::logic_error if incomplete JSON tree
void check_complete();
//! \throw std::logic_error if incomplete JSON tree. \return JSON bytes
epee::byte_slice take_json();
epee::byte_stream take_json();
//! Flush bytes in local buffer to `do_flush(...)`
void flush()
@@ -78,6 +78,9 @@ namespace wire
}
public:
//! JSON does not need array sizes.
static constexpr std::false_type need_array_size() noexcept { return{}; }
json_writer(const json_writer&) = delete;
virtual ~json_writer() noexcept;
json_writer& operator=(const json_writer&) = delete;
@@ -113,12 +116,18 @@ namespace wire
//! Buffers entire JSON message in memory
struct json_slice_writer final : json_writer
{
using sink = epee::byte_stream;
explicit json_slice_writer(sink&& out)
: json_writer(std::move(out), false)
{}
explicit json_slice_writer()
: json_writer(false)
: json_writer(epee::byte_stream{}, false)
{}
//! \throw std::logic_error if incomplete JSON tree \return JSON bytes
epee::byte_slice take_bytes()
epee::byte_stream take_sink()
{
return json_writer::take_json();
}
@@ -132,7 +141,7 @@ namespace wire
virtual void do_flush(epee::span<const std::uint8_t>) override final;
public:
explicit json_stream_writer(std::ostream& dest)
: json_writer(true), dest(dest)
: json_writer(epee::byte_stream{}, true), dest(dest)
{}
//! Flush remaining bytes to stream \throw std::logic_error if incomplete JSON tree
@@ -142,45 +151,4 @@ namespace wire
flush();
}
};
template<typename T>
epee::byte_slice json::to_bytes(const T& source)
{
return wire_write::to_bytes<json_slice_writer>(source);
}
template<typename T, typename F = identity_>
inline void array(json_writer& dest, const T& source, F filter = F{})
{
// works with "lazily" computed ranges
wire_write::array(dest, source, 0, std::move(filter));
}
template<typename T, typename F>
inline void write_bytes(json_writer& dest, as_array_<T, F> source)
{
wire::array(dest, source.get_value(), std::move(source.filter));
}
template<typename T>
inline enable_if<is_array<T>::value> write_bytes(json_writer& dest, const T& source)
{
wire::array(dest, source);
}
template<typename T, typename F = identity_, typename G = identity_>
inline void dynamic_object(json_writer& dest, const T& source, F key_filter = F{}, G value_filter = G{})
{
// works with "lazily" computed ranges
wire_write::dynamic_object(dest, source, 0, std::move(key_filter), std::move(value_filter));
}
template<typename T, typename F, typename G>
inline void write_bytes(json_writer& dest, as_object_<T, F, G> source)
{
wire::dynamic_object(dest, source.get_map(), std::move(source.key_filter), std::move(source.value_filter));
}
template<typename... T>
inline void object(json_writer& dest, T... fields)
{
wire_write::object(dest, std::move(fields)...);
}
}