diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp index dad8ea1d3b1..bb2f920a152 100644 --- a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp +++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/poseidon2.cpp @@ -7,7 +7,7 @@ namespace bb::crypto { template typename Poseidon2::FF Poseidon2::hash(const std::vector::FF>& input) { - return Sponge::hash_fixed_length(input); + return Sponge::hash_internal(input); } /** diff --git a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp index eb89c96e471..72324c2654b 100644 --- a/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp +++ b/barretenberg/cpp/src/barretenberg/crypto/poseidon2/sponge/sponge.hpp @@ -125,12 +125,10 @@ 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; @@ -140,13 +138,6 @@ template output; for (size_t i = 0; i < out_len; ++i) { output[i] = sponge.squeeze(); @@ -154,16 +145,6 @@ 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]; } - - template static std::array hash_variable_length(std::span input) - { - return hash_internal(input); - } - static FF hash_variable_length(std::span input) { return hash_variable_length<1>(input)[0]; } + static FF hash_internal(std::span input) { return hash_internal<1>(input)[0]; } }; } // namespace bb::crypto \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp index 82aa0ffc054..2e41a8ceae8 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/poseidon2.cpp @@ -14,7 +14,7 @@ template field_t poseidon2::hash(C& builder, const std::vecto * This should just call the sponge variable length hash function * */ - return Sponge::hash_fixed_length(builder, inputs); + return Sponge::hash_internal(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 a812ec7811e..72d9df6cd35 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/hash/poseidon2/sponge/sponge.hpp @@ -134,7 +134,7 @@ template */ - template + template static std::array hash_internal(Builder& builder, std::span input) { size_t in_len = input.size(); @@ -145,13 +145,6 @@ template output; for (size_t i = 0; i < out_len; ++i) { output[i] = sponge.squeeze(); @@ -159,24 +152,9 @@ template - 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) - { - return hash_fixed_length<1>(builder, input)[0]; - } - - template - static std::array hash_variable_length(Builder& builder, std::span input) - { - return hash_internal(builder, input); - } - static field_t hash_variable_length(Builder& builder, std::span input) + static field_t hash_internal(Builder& builder, std::span input) { - return hash_variable_length<1>(builder, input)[0]; + return hash_internal<1>(builder, input)[0]; } }; } // namespace bb::stdlib \ No newline at end of file