From 0f576100ae487af5565705cc242dbc64e8debce0 Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Fri, 29 Jan 2021 16:01:48 +0800 Subject: [PATCH] Revert "addopt byte_slice" --- src/page.h | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/page.h b/src/page.h index 38dfa29..77a047c 100644 --- a/src/page.h +++ b/src/page.h @@ -1446,22 +1446,17 @@ show_block_hex(size_t block_height, bool complete_blk) return string {"Failed to obtain complete block data "}; } - //std::string complete_block_data_str; - epee::byte_slice complete_block_data_slice; + std::string complete_block_data_str; if(!epee::serialization::store_t_to_binary( - complete_block_data, complete_block_data_slice)) + complete_block_data, complete_block_data_str)) { 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(block_data_str); + ::buff_to_hex_nodelimer(complete_block_data_str); } } catch (std::exception const& e) @@ -1748,10 +1743,10 @@ show_ringmemberstx_jsonhex(string const& tx_hash_str) return json {"error", "Failed to obtain complete block data "}; } - epee::byte_slice complete_block_data_slice; + std::string complete_block_data_str; if(!epee::serialization::store_t_to_binary( - complete_block_data, complete_block_data_slice)) + complete_block_data, complete_block_data_str)) { cerr << "Failed to serialize complete_block_data\n"; return json {"error", "Failed to obtain complete block data"}; @@ -1763,10 +1758,6 @@ 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);