diff --git a/depends/libff b/depends/libff index accdf9e7..04094606 160000 --- a/depends/libff +++ b/depends/libff @@ -1 +1 @@ -Subproject commit accdf9e761979ac8c95dced219cac0b4ad4a4799 +Subproject commit 04094606d6e90f4d6a2d6a9d32a3a5a660b67bd4 diff --git a/depends/libfqfft b/depends/libfqfft index 7d460caa..415d38df 160000 --- a/depends/libfqfft +++ b/depends/libfqfft @@ -1 +1 @@ -Subproject commit 7d460caa27b87574fe0e8144e6a3a66b7bcfe770 +Subproject commit 415d38df733b264d1ada69e1f6edc2f809c9b502 diff --git a/libiop/bcs/hashing/blake2b.cpp b/libiop/bcs/hashing/blake2b.cpp index ff980b6b..fc838c1c 100644 --- a/libiop/bcs/hashing/blake2b.cpp +++ b/libiop/bcs/hashing/blake2b.cpp @@ -29,6 +29,7 @@ binary_hash_digest blake2b_two_to_one_hash(const binary_hash_digest &first, const binary_hash_digest &second, const std::size_t digest_len_bytes) { + printf("%s, %s\n", first.c_str(), second.c_str()); const binary_hash_digest first_plus_second = first + second; binary_hash_digest result(digest_len_bytes, 'X'); diff --git a/libiop/tests/bcs/test_bcs_transformation.cpp b/libiop/tests/bcs/test_bcs_transformation.cpp index 23d6df51..20b28d71 100644 --- a/libiop/tests/bcs/test_bcs_transformation.cpp +++ b/libiop/tests/bcs/test_bcs_transformation.cpp @@ -63,11 +63,15 @@ bcs_transformation_parameters get_bcs_parameters(bool alge if (algebraic_hashchain) { bcs_parameters.hashchain_ = std::make_shared>(); + bcs_parameters.hash_enum = bcs_hash_type::high_alpha_poseidon_type; } else { bcs_parameters.hashchain_ = std::make_shared>(security_parameter); + bcs_parameters.hash_enum = bcs_hash_type::blake2b_type; } - set_bcs_parameters_leafhash(bcs_parameters); + set_bcs_parameters_leafhash(bcs_parameters); // Work per hash. Todo generalize this w/ proper explanations of work amounts + const size_t work_per_hash = (bcs_parameters.hash_enum == 1) ? 1 : 128; + bcs_parameters.pow_params_ = pow_parameters(4, work_per_hash); return bcs_parameters; }