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

Fix a few serialization functions

Browse Source
This commit is contained in:
Lee Clagett
2020-08-20 16:55:51 -04:00
parent a2ff89bc24
commit 535fd2bd97
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/db/data.cpp
View File

@@ -146,14 +146,14 @@ namespace db
void map_spend(F& format, T1& self, T2& payment_id) void map_spend(F& format, T1& self, T2& payment_id)
{ {
wire::object(format, wire::object(format,
wire::field("height", self.link.height), wire::field("height", std::ref(self.link.height)),
wire::field("tx_hash", std::ref(self.link.tx_hash)), wire::field("tx_hash", std::ref(self.link.tx_hash)),
WIRE_FIELD(image), WIRE_FIELD(image),
WIRE_FIELD(source), WIRE_FIELD(source),
WIRE_FIELD(timestamp), WIRE_FIELD(timestamp),
WIRE_FIELD(unlock_time), WIRE_FIELD(unlock_time),
WIRE_FIELD(mixin_count), WIRE_FIELD(mixin_count),
wire::optional_field("payment_id", payment_id) wire::optional_field("payment_id", std::ref(payment_id))
); );
} }
} }
@@ -185,8 +185,8 @@ namespace db
{ {
wire::object(format, wire::object(format,
wire::field("key_image", std::ref(self.value)), wire::field("key_image", std::ref(self.value)),
wire::field("tx_hash", std::ref(self.link.tx_hash)), wire::field("tx_hash", std::ref(self.link.tx_hash)),
wire::field("height", self.link.height) wire::field("height", std::ref(self.link.height))
); );
} }
} }

4
src/rpc/daemon_zmq.cpp
View File

@@ -85,7 +85,7 @@ namespace cryptonote
{ {
wire::object(source, wire::object(source,
WIRE_FIELD(amount), WIRE_FIELD(amount),
wire::variant_field("transaction output variant", std::ref(self.target), wire::variant_field("transaction output variant", std::ref(self.target),
wire::option<txout_to_key>{"to_key"}, wire::option<txout_to_key>{"to_key"},
wire::option<txout_to_script>{"to_script"}, wire::option<txout_to_script>{"to_script"},
wire::option<txout_to_scripthash>{"to_scripthash"} wire::option<txout_to_scripthash>{"to_scripthash"}
@@ -112,7 +112,7 @@ namespace cryptonote
static void read_bytes(wire::json_reader& source, txin_v& self) static void read_bytes(wire::json_reader& source, txin_v& self)
{ {
wire::object(source, wire::object(source,
wire::variant_field("transaction input variant", std::ref(self), wire::variant_field("transaction input variant", std::ref(self),
wire::option<txin_to_key>{"to_key"}, wire::option<txin_to_key>{"to_key"},
wire::option<txin_gen>{"gen"}, wire::option<txin_gen>{"gen"},
wire::option<txin_to_script>{"to_script"}, wire::option<txin_to_script>{"to_script"},