From 5f7992f0ea4dc6b5d51ee9f7e7d5c071ad215406 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Mon, 8 Nov 2021 10:04:53 +0100
Subject: [PATCH] Minor

---
 src/bin/bench_recursion.rs | 9 +++------
 src/hash/hashing.rs        | 4 ----
 src/plonk/config.rs        | 1 -
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/bin/bench_recursion.rs b/src/bin/bench_recursion.rs
index e1470790..30da9687 100644
--- a/src/bin/bench_recursion.rs
+++ b/src/bin/bench_recursion.rs
@@ -16,13 +16,10 @@ fn main() -> Result<()> {
     // change this to info or warn later.
     env_logger::Builder::from_env(Env::default().default_filter_or("debug")).init();
 
-    bench_prove()
+    bench_prove::<PoseidonGoldilocksConfig, 2>()
 }
 
-fn bench_prove() -> Result<()> {
-    const D: usize = 2;
-    type C = PoseidonGoldilocksConfig;
-    type F = <C as GenericConfig<D>>::F;
+fn bench_prove<C: GenericConfig<D>, const D: usize>() -> Result<()> {
     let config = CircuitConfig {
         num_wires: 126,
         num_routed_wires: 33,
@@ -40,7 +37,7 @@ fn bench_prove() -> Result<()> {
     };
 
     let inputs = PartialWitness::new();
-    let mut builder = CircuitBuilder::<F, D>::new(config);
+    let mut builder = CircuitBuilder::<C::F, D>::new(config);
 
     let zero = builder.zero();
     let zero_ext = builder.zero_extension();
diff --git a/src/hash/hashing.rs b/src/hash/hashing.rs
index dbaf5a17..d2db82ca 100644
--- a/src/hash/hashing.rs
+++ b/src/hash/hashing.rs
@@ -156,7 +156,3 @@ pub fn hash_n_to_hash<F: RichField, P: PlonkyPermutation<F>>(
 ) -> HashOut<F> {
     HashOut::from_vec(hash_n_to_m::<F, P>(inputs, 4, pad))
 }
-
-pub fn hash_n_to_1<F: RichField, P: PlonkyPermutation<F>>(inputs: Vec<F>, pad: bool) -> F {
-    hash_n_to_m::<F, P>(inputs, 1, pad)[0]
-}
diff --git a/src/plonk/config.rs b/src/plonk/config.rs
index 3cc82639..c628bc38 100644
--- a/src/plonk/config.rs
+++ b/src/plonk/config.rs
@@ -24,7 +24,6 @@ pub trait Hasher<F: RichField>: Sized + Clone + Debug + Eq + PartialEq {
     type Hash: From<Vec<u8>>
         + Into<Vec<u8>>
         + Into<Vec<F>>
-        + Into<u64>
         + Copy
         + Clone
         + Debug