From 29824f1e3e9a4ccc738f5ad33ea65528edb1897b Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Fri, 18 Dec 2020 16:29:42 +0800 Subject: [PATCH] addopt byte_slice --- src/page.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/page.h b/src/page.h index 77a047c..38dfa29 100644 --- a/src/page.h +++ b/src/page.h @@ -1446,17 +1446,22 @@ show_block_hex(size_t block_height, bool complete_blk) return string {"Failed to obtain complete block data "}; } - std::string complete_block_data_str; + //std::string complete_block_data_str; + epee::byte_slice complete_block_data_slice; if(!epee::serialization::store_t_to_binary( - complete_block_data, complete_block_data_str)) + complete_block_data, complete_block_data_slice)) { cerr << "Failed to serialize complete_block_data\n"; return string {"Failed to obtain complete block data"}; } + std::string block_data_str( + complete_block_data_slice.begin(), + complete_block_data_slice.end()); + return epee::string_tools - ::buff_to_hex_nodelimer(complete_block_data_str); + ::buff_to_hex_nodelimer(block_data_str); } } catch (std::exception const& e) @@ -1743,10 +1748,10 @@ show_ringmemberstx_jsonhex(string const& tx_hash_str) return json {"error", "Failed to obtain complete block data "}; } - std::string complete_block_data_str; + epee::byte_slice complete_block_data_slice; if(!epee::serialization::store_t_to_binary( - complete_block_data, complete_block_data_str)) + complete_block_data, complete_block_data_slice)) { cerr << "Failed to serialize complete_block_data\n"; return json {"error", "Failed to obtain complete block data"}; @@ -1758,6 +1763,10 @@ show_ringmemberstx_jsonhex(string const& tx_hash_str) tx_json["payment_id8"] = pod_to_hex(txd.payment_id8); tx_json["payment_id8e"] = pod_to_hex(txd.payment_id8); + std::string complete_block_data_str( + complete_block_data_slice.begin(), + complete_block_data_slice.end()); + tx_json["block"] = epee::string_tools ::buff_to_hex_nodelimer(complete_block_data_str);