perdeshen-hash

Forgot to save after resolving merge conflict.
This commit is contained in:
gluax 2021-03-25 11:31:08 -04:00 committed by GitHub
parent 128eb60dfb
commit afc42bcecd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -19,11 +19,7 @@ circuit PedersenHash {
// The 'pedersen-hash' main function.
function main(hash_input: [bool; 256], const parameters: [group; 256]) -> group {
<<<<<<< HEAD
const pedersen = PedersenHash::new(parameters);
=======
let pedersen = PedersenHash::new(parameters);
>>>>>>> 9b61d0fa152f435e3e165090455c85eedeb9b770
return pedersen.hash(hash_input)
}