From e827ff5c865d350b83e143208243a5334917ca95 Mon Sep 17 00:00:00 2001 From: Amir Taaki Date: Wed, 21 Jan 2015 22:29:43 +0100 Subject: [PATCH] delete uneeded code, replace with bc::hash_literal as per William Swanson (s_tec)'s comment. --- code/merkle.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/code/merkle.cpp b/code/merkle.cpp index 52f983fe..e61f55ec 100644 --- a/code/merkle.cpp +++ b/code/merkle.cpp @@ -47,21 +47,13 @@ bc::hash_digest create_merkle(bc::hash_list& merkle) return merkle[0]; } -// Convert hex string to hash bytes. -bc::hash_digest get_hash(const std::string& value) -{ - bc::hash_digest result; - bool success = bc::decode_hash(result, value); - return result; -} - int main() { // Replace these hashes with ones from a block to reproduce the same merkle root. bc::hash_list tx_hashes{{ - get_hash("0000000000000000000000000000000000000000000000000000000000000000"), - get_hash("0000000000000000000000000000000000000000000000000000000000000011"), - get_hash("0000000000000000000000000000000000000000000000000000000000000022"), + bc::hash_literal("0000000000000000000000000000000000000000000000000000000000000000"), + bc::hash_literal("0000000000000000000000000000000000000000000000000000000000000011"), + bc::hash_literal("0000000000000000000000000000000000000000000000000000000000000022"), }}; const bc::hash_digest merkle_root = create_merkle(tx_hashes); std::cout << "Result: " << bc::encode_hex(merkle_root) << std::endl;