From 02972a1bcd97c94f11ce172f87d2337cc2e96715 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 9 Feb 2017 21:10:08 +0000 Subject: [PATCH] [cleanup] Simplify test code --- src/gtest/test_merkletree.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gtest/test_merkletree.cpp b/src/gtest/test_merkletree.cpp index a8960d762..6bac9ab3c 100644 --- a/src/gtest/test_merkletree.cpp +++ b/src/gtest/test_merkletree.cpp @@ -189,18 +189,20 @@ void test_tree( } } +#define MAKE_STRING(x) std::string((x), (x)+sizeof(x)) + TEST(merkletree, vectors) { - UniValue root_tests = read_json(std::string(json_tests::merkle_roots, json_tests::merkle_roots + sizeof(json_tests::merkle_roots))); - UniValue ser_tests = read_json(std::string(json_tests::merkle_serialization, json_tests::merkle_serialization + sizeof(json_tests::merkle_serialization))); - UniValue witness_ser_tests = read_json(std::string(json_tests::merkle_witness_serialization, json_tests::merkle_witness_serialization + sizeof(json_tests::merkle_witness_serialization))); - UniValue path_tests = read_json(std::string(json_tests::merkle_path, json_tests::merkle_path + sizeof(json_tests::merkle_path))); - UniValue commitment_tests = read_json(std::string(json_tests::merkle_commitments, json_tests::merkle_commitments + sizeof(json_tests::merkle_commitments))); + UniValue root_tests = read_json(MAKE_STRING(json_tests::merkle_roots)); + UniValue ser_tests = read_json(MAKE_STRING(json_tests::merkle_serialization)); + UniValue witness_ser_tests = read_json(MAKE_STRING(json_tests::merkle_witness_serialization)); + UniValue path_tests = read_json(MAKE_STRING(json_tests::merkle_path)); + UniValue commitment_tests = read_json(MAKE_STRING(json_tests::merkle_commitments)); test_tree(commitment_tests, root_tests, ser_tests, witness_ser_tests, path_tests); } TEST(merkletree, emptyroots) { - UniValue empty_roots = read_json(std::string(json_tests::merkle_roots_empty, json_tests::merkle_roots_empty + sizeof(json_tests::merkle_roots_empty))); + UniValue empty_roots = read_json(MAKE_STRING(json_tests::merkle_roots_empty)); libzcash::EmptyMerkleRoots<64, libzcash::SHA256Compress> emptyroots;