diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-01-28 13:55:49 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-01-28 13:55:50 +0200 |
| commit | 4a0e4c7d706f33fb72fe809434676b1de7b4b4f7 (patch) | |
| tree | 36fdd03f84ae78dbd217b5bd255bd86e33db1bcc /src/serialization/json_object.cpp | |
| parent | Merge pull request #5008 (diff) | |
| parent | Pruning (diff) | |
| download | monero-4a0e4c7d706f33fb72fe809434676b1de7b4b4f7.tar.xz | |
Merge pull request #4843
b750fb27 Pruning (moneromooo-monero)
Diffstat (limited to 'src/serialization/json_object.cpp')
| -rw-r--r-- | src/serialization/json_object.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/serialization/json_object.cpp b/src/serialization/json_object.cpp index 8b1af9c12..ee4fa4a19 100644 --- a/src/serialization/json_object.cpp +++ b/src/serialization/json_object.cpp @@ -734,6 +734,7 @@ void toJsonValue(rapidjson::Document& doc, const cryptonote::rpc::peer& peer, ra INSERT_INTO_JSON_OBJECT(val, doc, ip, peer.ip); INSERT_INTO_JSON_OBJECT(val, doc, port, peer.port); INSERT_INTO_JSON_OBJECT(val, doc, last_seen, peer.last_seen); + INSERT_INTO_JSON_OBJECT(val, doc, pruning_seed, peer.pruning_seed); } @@ -748,6 +749,7 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::rpc::peer& peer) GET_FROM_JSON_OBJECT(val, peer.ip, ip); GET_FROM_JSON_OBJECT(val, peer.port, port); GET_FROM_JSON_OBJECT(val, peer.last_seen, last_seen); + GET_FROM_JSON_OBJECT(val, peer.pruning_seed, pruning_seed); } void toJsonValue(rapidjson::Document& doc, const cryptonote::rpc::tx_in_pool& tx, rapidjson::Value& val) |