rename tx, transfer, output query deserialize() ->

deserialize_from_block() because json str is rooted at block
This commit is contained in:
woodser
2019-11-30 17:48:09 -05:00
parent 78e8f60e60
commit eafd073093
2 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -345,7 +345,7 @@ namespace monero {
}
}
shared_ptr<monero_tx_query> monero_tx_query::deserialize(const string& tx_query_json) {
shared_ptr<monero_tx_query> monero_tx_query::deserialize_from_block(const string& tx_query_json) {
// deserialize tx query string to property rooted at block
std::istringstream iss = tx_query_json.empty() ? std::istringstream() : std::istringstream(tx_query_json);
@@ -728,7 +728,7 @@ namespace monero {
}
}
shared_ptr<monero_transfer_query> monero_transfer_query::deserialize(const string& transfer_query_json) {
shared_ptr<monero_transfer_query> monero_transfer_query::deserialize_from_block(const string& transfer_query_json) {
// deserialize transfer query string to property rooted at block
std::istringstream iss = transfer_query_json.empty() ? std::istringstream() : std::istringstream(transfer_query_json);
@@ -951,7 +951,7 @@ namespace monero {
}
}
shared_ptr<monero_output_query> monero_output_query::deserialize(const string& output_query_json) {
shared_ptr<monero_output_query> monero_output_query::deserialize_from_block(const string& output_query_json) {
// deserialize output query string to property rooted at block
std::istringstream iss = output_query_json.empty() ? std::istringstream() : std::istringstream(output_query_json);
+3 -3
View File
@@ -192,7 +192,7 @@ namespace monero {
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
static void from_property_tree(const boost::property_tree::ptree& node, const shared_ptr<monero_transfer_query>& transfer_query);
static shared_ptr<monero_transfer_query> deserialize(const string& transfer_query_json);
static shared_ptr<monero_transfer_query> deserialize_from_block(const string& transfer_query_json);
shared_ptr<monero_transfer_query> copy(const shared_ptr<monero_transfer>& src, const shared_ptr<monero_transfer>& tgt) const;
shared_ptr<monero_transfer_query> copy(const shared_ptr<monero_transfer_query>& src, const shared_ptr<monero_transfer_query>& tgt) const;
boost::optional<bool> is_incoming() const;
@@ -229,7 +229,7 @@ namespace monero {
//boost::property_tree::ptree to_property_tree() const;
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
static void from_property_tree(const boost::property_tree::ptree& node, const shared_ptr<monero_output_query>& output_query);
static shared_ptr<monero_output_query> deserialize(const string& output_query_json);
static shared_ptr<monero_output_query> deserialize_from_block(const string& output_query_json);
bool is_default() const;
shared_ptr<monero_output_query> copy(const shared_ptr<monero_output>& src, const shared_ptr<monero_output>& tgt) const;
shared_ptr<monero_output_query> copy(const shared_ptr<monero_output_wallet>& src, const shared_ptr<monero_output_wallet>& tgt) const; // TODO: necessary to override all super classes?
@@ -286,7 +286,7 @@ namespace monero {
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
static void from_property_tree(const boost::property_tree::ptree& node, const shared_ptr<monero_tx_query>& tx_query);
static shared_ptr<monero_tx_query> deserialize(const string& tx_query_json);
static shared_ptr<monero_tx_query> deserialize_from_block(const string& tx_query_json);
shared_ptr<monero_tx_query> copy(const shared_ptr<monero_tx>& src, const shared_ptr<monero_tx>& tgt) const;
shared_ptr<monero_tx_query> copy(const shared_ptr<monero_tx_wallet>& src, const shared_ptr<monero_tx_wallet>& tgt) const; // TODO: necessary to override all super classes?
shared_ptr<monero_tx_query> copy(const shared_ptr<monero_tx_query>& src, const shared_ptr<monero_tx_query>& tgt) const;