Merge pull request #224 from moneroexamples/devel

addopt byte_slice
This commit is contained in:
moneroexamples 2021-01-23 15:27:29 +08:00 committed by GitHub
commit 18125278ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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);