incremental merkle tree test: resolve invalid deserialization/serialization data equality check.

furszy · furszy · commit 4368a0098413 · 2020-10-01T17:49:35.000-03:00
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
@@ -15,6 +15,11 @@ set(JSON_TEST_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/data/tx_invalid.json
         ${CMAKE_CURRENT_SOURCE_DIR}/data/tx_valid.json
         ${CMAKE_CURRENT_SOURCE_DIR}/data/sighash.json
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/merkle_roots_sapling.json
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/merkle_serialization_sapling.json
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/merkle_witness_serialization_sapling.json
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/merkle_path_sapling.json
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/merkle_commitments_sapling.json
         ${CMAKE_CURRENT_SOURCE_DIR}/data/sapling_key_components.json
         )
 
@@ -52,6 +57,7 @@ set(BITCOIN_TEST_SUITE
         ${CMAKE_CURRENT_SOURCE_DIR}/test_pivx.cpp
         ${CMAKE_SOURCE_DIR}/src/wallet/test/wallet_test_fixture.h
         ${CMAKE_SOURCE_DIR}/src/wallet/test/wallet_test_fixture.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/librust/json_test_vectors.h
         )
 
 set(BITCOIN_TESTS
@@ -69,6 +75,7 @@ set(BITCOIN_TESTS
         ${CMAKE_CURRENT_SOURCE_DIR}/librust/sapling_keystore_tests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/librust/zip32_tests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/librust/wallet_zkeys_tests.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/librust/merkletree_tests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/base32_tests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/base58_tests.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/base64_tests.cpp
diff --git a/src/test/librust/json_test_vectors.h b/src/test/librust/json_test_vectors.h
@@ -21,13 +21,14 @@ void expect_deser_same(const T& expected)
 
     auto serialized_size = ss1.size();
 
+    CDataStream ss1Copy = ss1;
     T object;
-    ss1 >> object;
+    ss1Copy >> object;
 
     CDataStream ss2(SER_NETWORK, PROTOCOL_VERSION);
     ss2 << object;
 
-    BOOST_CHECK_EQUAL(serialized_size, ss2.size());
+    BOOST_ASSERT(serialized_size == ss2.size());
     BOOST_CHECK(memcmp(&*ss1.begin(), &*ss2.begin(), serialized_size) == 0);
 }
 
