[Depends][Test] Update pedersen_hash_test to account for updated librustzcash encoding.

furszy · furszy · commit 5e27e456b846 · 2020-08-02T23:03:30.000-03:00
diff --git a/depends/packages/crate_pairing.mk b/depends/packages/crate_pairing.mk
@@ -1,9 +1,9 @@
 package=crate_pairing
 $(package)_crate_name=pairing
-$(package)_version=0.14.1
+$(package)_version=0.14.2
 $(package)_download_path=https://static.crates.io/crates/$($(package)_crate_name)
 $(package)_file_name=$($(package)_crate_name)-$($(package)_version).crate
-$(package)_sha256_hash=06f21a403a78257de696b59a5bfafad56a3b3ab8f27741c8122750bf0ebbb9fa
+$(package)_sha256_hash=ceda21136251c6d5a422d3d798d8ac22515a6e8d3521bb60c59a8349d36d0d57
 $(package)_crate_versioned_name=$($(package)_crate_name)
 
 define $(package)_preprocess_cmds
diff --git a/depends/packages/crate_sapling_crypto.mk b/depends/packages/crate_sapling_crypto.mk
@@ -3,8 +3,8 @@ $(package)_crate_name=sapling-crypto
 $(package)_download_path=https://github.com/zcash-hackworks/$($(package)_crate_name)/archive/
 $(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
 $(package)_download_file=$($(package)_git_commit).tar.gz
-$(package)_sha256_hash=5062b9e752066ad959f14063d496b0a156ce96004a13a6823494249793c01f96
-$(package)_git_commit=7beeb52730e24724ee10ea2458ecf7776cb59c58
+$(package)_sha256_hash=480ffc31b399a9517178289799f9db01152bedbc534a6a2d2dbac245421fb6fe
+$(package)_git_commit=6abfcca25ae233922ecc18a4d2d0b5cb7aab7c8c
 $(package)_crate_versioned_name=$($(package)_crate_name)
 
 define $(package)_preprocess_cmds
diff --git a/depends/packages/librustzcash.mk b/depends/packages/librustzcash.mk
@@ -3,8 +3,8 @@ $(package)_version=0.1
 $(package)_download_path=https://github.com/zcash/$(package)/archive/
 $(package)_file_name=$(package)-$($(package)_git_commit).tar.gz
 $(package)_download_file=$($(package)_git_commit).tar.gz
-$(package)_sha256_hash=c5442a57d8961aab12fd395a5004edbb96b973511fab3949a087faa2a865a002
-$(package)_git_commit=ef676eff5084d394e6c6eaf2b9d9817effe662a7
+$(package)_sha256_hash=1fb331a92b63da41e95ef9db671982d243a13bcd6d25570760c9ca83b8996887
+$(package)_git_commit=36d7acf3f37570f499fc8fe79fda372e5eb873ca
 $(package)_dependencies=rust $(rust_crates)
 $(package)_patches=cargo.config
 
diff --git a/depends/patches/librustzcash/cargo.config b/depends/patches/librustzcash/cargo.config
@@ -8,7 +8,7 @@ replace-with = "vendored-sources"
 
 [source."https://github.com/zcash-hackworks/sapling-crypto"]
 git = "https://github.com/zcash-hackworks/sapling-crypto"
-rev = "7beeb52730e24724ee10ea2458ecf7776cb59c58"
+rev = "6abfcca25ae233922ecc18a4d2d0b5cb7aab7c8c"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]
diff --git a/src/test/librust/pedersen_hash_tests.cpp b/src/test/librust/pedersen_hash_tests.cpp
@@ -14,13 +14,13 @@ BOOST_FIXTURE_TEST_SUITE(pedersen_hash_tests, BasicTestingSetup)
 BOOST_AUTO_TEST_CASE(pedersen_hash_testvectors)
 {
     // Good scenario check
-    const uint256 a = uint256S("0acaa62d40fcdd9192ed35ea9df31660ccf7f6c60566530faaa444fb5d0d410e");
-    const uint256 b = uint256S("6041357de59ba64959d1b60f93de24dfe5ea1e26ed9e8a73d35b225a1845ba70");
+    const uint256 a = uint256S("87a086ae7d2252d58729b30263fb7b66308bf94ef59a76c9c86e7ea016536505");
+    const uint256 b = uint256S("a75b84a125b2353da7e8d96ee2a15efe4de23df9601b9d9564ba59de57130406");
     uint256 result;
 
     librustzcash_merkle_hash(25, a.begin(), b.begin(), result.begin());
 
-    uint256 expected_result = uint256S("4253b36834b3f64cc6182f1816911e1c9460cb88afeafb155244dd0038ad4717");
+    uint256 expected_result = uint256S("5bf43b5736c19b714d1f462c9d22ba3492c36e3d9bbd7ca24d94b440550aa561");
 
     BOOST_CHECK(result == expected_result);
 
