diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp index 1fce753975b..635b8dc0896 100644 --- a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp +++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp @@ -7,8 +7,7 @@ namespace bb::crypto { template typename Poseidon2::FF Poseidon2::hash(const std::vector::FF>& input) { - auto input_span = input; - return Sponge::hash_fixed_length(input_span); + return Sponge::hash_fixed_length(input); } /** diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.test.cpp index 7903d1fceb6..c18da87b739 100644 --- a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.test.cpp +++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.test.cpp @@ -52,12 +52,15 @@ TEST(Poseidon2, HashBufferConsistencyCheck) // element fr a(std::string("00000b615c4d3e2fa0b1c2d3e4f56789fedcba9876543210abcdef0123456789")); - auto input_vec = to_buffer(a); // takes field element and converts it to 32 bytes + // takes field element and converts it to 32 bytes + auto input_vec = to_buffer(a); + bb::fr result1 = crypto::Poseidon2::hash_buffer(input_vec); input_vec.erase(input_vec.begin()); // erase first byte since we want 31 bytes + fr result2 = crypto::Poseidon2::hash_buffer(input_vec); + std::vector input{ a }; auto expected = crypto::Poseidon2::hash(input); - fr result = crypto::Poseidon2::hash_buffer(input_vec); - - EXPECT_EQ(result, expected); + EXPECT_NE(result1, expected); + EXPECT_EQ(result2, expected); } diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp index 2a99b88609f..eb89c96e471 100644 --- a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp +++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp @@ -129,7 +129,8 @@ template */ - template static std::array hash_internal(std::span input) + template + static std::array hash_internal(std::span input) { size_t in_len = input.size(); const uint256_t iv = (static_cast(in_len) << 64) + out_len - 1; @@ -153,11 +154,11 @@ template static std::array hash_fixed_length(std::span input) + template static std::array hash_fixed_length(std::span input) { return hash_internal(input); } - static FF hash_fixed_length(std::span input) { return hash_fixed_length<1>(input)[0]; } + static FF hash_fixed_length(std::span input) { return hash_fixed_length<1>(input)[0]; } template static std::array hash_variable_length(std::span input) { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp index d113d2a3cb8..705493bf345 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp @@ -14,8 +14,7 @@ template field_t poseidon2::hash(C& builder, const std::vecto * This should just call the sponge variable length hash function * */ - auto input{ inputs }; - return Sponge::hash_fixed_length(builder, input); + return Sponge::hash_fixed_length(builder, inputs); } /** diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp index bccebbd152c..6d79834aa95 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp @@ -135,7 +135,7 @@ template */ template - static std::array hash_internal(Builder& builder, std::span input) + static std::array hash_internal(Builder& builder, std::span input) { size_t in_len = input.size(); const uint256_t iv = (static_cast(in_len) << 64) + out_len - 1; @@ -160,11 +160,11 @@ template - static std::array hash_fixed_length(Builder& builder, std::span input) + static std::array hash_fixed_length(Builder& builder, std::span input) { return hash_internal(builder, input); } - static field_t hash_fixed_length(Builder& builder, std::span input) + static field_t hash_fixed_length(Builder& builder, std::span input) { return hash_fixed_length<1>(builder, input)[0]; }