chore: update usage of poseidon

Author: TomAFrench

docs/docs/noir/standard_library/containers/hashmap.md

@@ -16,7 +16,7 @@ Example:
 ```rust
 // Create a mapping from Fields to u32s with a maximum length of 12
 // using a poseidon2 hasher
-use std::hash::poseidon2::Poseidon2Hasher;
+use poseidon::poseidon2::Poseidon2Hasher;
 let mut map: HashMap<Field, u32, 12, BuildHasherDefault<Poseidon2Hasher>> = HashMap::default();
 
 map.insert(1, 2);

docs/docs/noir/standard_library/cryptographic_primitives/hashes.mdx

@@ -83,35 +83,6 @@ Given an initial `[u64; 25]` state, returns the state resulting from applying a
 
 <BlackBoxInfo to="../black_box_fns"/>
 
-## poseidon
-
-Given an array of Fields, returns a new Field with the Poseidon Hash. Mind that you need to specify
-how many inputs are there to your Poseidon function.
-
-```rust
-// example for hash_1, hash_2 accepts an array of length 2, etc
-fn hash_1(input: [Field; 1]) -> Field
-```
-
-example:
-
-#include_code poseidon test_programs/execution_success/poseidon_bn254_hash/src/main.nr rust
-
-## poseidon 2
-
-Given an array of Fields, returns a new Field with the Poseidon2 Hash. Contrary to the Poseidon
-function, there is only one hash and you can specify a message_size to hash only the first 
-`message_size` bytes of the input,
-
-```rust
-// example for hashing the first three elements of the input
-Poseidon2::hash(input, 3);
-```
-
-example:
-
-#include_code poseidon2 test_programs/execution_success/poseidon2/src/main.nr rust
-
 ## hash_to_field
 
 ```rust

test_programs/benchmarks/bench_eddsa_poseidon/Nargo.toml

@@ -6,3 +6,4 @@ authors = [""]
 
 [dependencies]
 ec = { tag = "v0.1.2", git = "https://github.com/noir-lang/ec" }
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

test_programs/benchmarks/bench_eddsa_poseidon/src/main.nr

@@ -1,11 +1,10 @@
+use poseidon::poseidon::PoseidonHasher;
 use std::default::Default;
 use std::hash::Hasher;
-use std::hash::poseidon::PoseidonHasher;
 
 use ec::consts::te::baby_jubjub;
 use ec::tecurve::affine::Point as TEPoint;
 
-
 fn main(
     msg: pub Field,
     pub_key_x: Field,

test_programs/benchmarks/bench_poseidon2_hash/Nargo.toml

@@ -5,3 +5,4 @@ type = "bin"
 authors = [""]
 
 [dependencies]
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

test_programs/benchmarks/bench_poseidon2_hash/src/main.nr

@@ -1,5 +1,3 @@
-use std::hash::poseidon2;
-
 fn main(input: [Field; 2]) -> pub Field {
-    poseidon2::Poseidon2::hash(input, input.len())
+    poseidon::poseidon2::Poseidon2::hash(input, input.len())
 }

test_programs/benchmarks/bench_poseidon2_hash_100/Nargo.toml

@@ -5,3 +5,4 @@ type = "bin"
 authors = [""]
 
 [dependencies]
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

test_programs/benchmarks/bench_poseidon2_hash_100/src/main.nr

@@ -1,11 +1,9 @@
-use std::hash::poseidon2;
-
 global SIZE: u32 = 100;
 
 fn main(input: [[Field; 2]; SIZE]) -> pub [Field; SIZE] {
     let mut results: [Field; SIZE] = [0; SIZE];
     for i in 0..SIZE {
-        results[i] = poseidon2::Poseidon2::hash(input[i], 2);
+        results[i] = poseidon::poseidon2::Poseidon2::hash(input[i], 2);
     }
 
     results

test_programs/benchmarks/bench_poseidon2_hash_30/Nargo.toml

@@ -5,3 +5,4 @@ type = "bin"
 authors = [""]
 
 [dependencies]
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

test_programs/benchmarks/bench_poseidon2_hash_30/src/main.nr

@@ -1,11 +1,9 @@
-use std::hash::poseidon2;
-
 global SIZE: u32 = 30;
 
 fn main(input: [[Field; 2]; SIZE]) -> pub [Field; SIZE] {
     let mut results: [Field; SIZE] = [0; SIZE];
     for i in 0..SIZE {
-        results[i] = poseidon2::Poseidon2::hash(input[i], 2);
+        results[i] = poseidon::poseidon2::Poseidon2::hash(input[i], 2);
     }
 
     results

test_programs/benchmarks/bench_poseidon_hash/Nargo.toml

@@ -5,3 +5,4 @@ type = "bin"
 authors = [""]
 
 [dependencies]
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

test_programs/benchmarks/bench_poseidon_hash/bench_poseidon_hash_100/Nargo.toml

@@ -1,5 +1,3 @@
-use std::hash::poseidon;
-
 fn main(input: [Field; 2]) -> pub Field {
-    poseidon::bn254::hash_2(input)
+    poseidon::poseidon::bn254::hash_2(input)
 }

test_programs/benchmarks/bench_poseidon_hash/bench_poseidon_hash_100/Prover.toml

@@ -5,3 +5,4 @@ type = "bin"
 authors = [""]
 
 [dependencies]
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

test_programs/benchmarks/bench_poseidon_hash/bench_poseidon_hash_100/src/main.nr

@@ -1,11 +1,9 @@
-use std::hash;
-
 global SIZE: u32 = 100;
 
 fn main(input: [[Field; 2]; SIZE]) -> pub [Field; SIZE] {
     let mut results: [Field; SIZE] = [0; SIZE];
     for i in 0..SIZE {
-        results[i] = hash::poseidon::bn254::hash_2(input[i]);
+        results[i] = poseidon::poseidon::bn254::hash_2(input[i]);
     }
 
     results

test_programs/benchmarks/bench_poseidon_hash/bench_poseidon_hash_30/Nargo.toml

@@ -5,3 +5,4 @@ type = "bin"
 authors = [""]
 
 [dependencies]
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

test_programs/benchmarks/bench_poseidon_hash/bench_poseidon_hash_30/Prover.toml

@@ -1,11 +1,9 @@
-use std::hash;
-
 global SIZE: u32 = 30;
 
 fn main(input: [[Field; 2]; SIZE]) -> pub [Field; SIZE] {
     let mut results: [Field; SIZE] = [0; SIZE];
     for i in 0..SIZE {
-        results[i] = hash::poseidon::bn254::hash_2(input[i]);
+        results[i] = poseidon::poseidon::bn254::hash_2(input[i]);
     }
 
     results

test_programs/benchmarks/bench_poseidon_hash/bench_poseidon_hash_30/src/main.nr

@@ -3,4 +3,5 @@ name = "hashmap_load_factor"
 type = "bin"
 authors = [""]
 
-[dependencies]
+[dependencies]
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

test_programs/benchmarks/bench_poseidon_hash/src/main.nr

@@ -1,14 +1,14 @@
 use std::collections::map::HashMap;
 use std::hash::BuildHasherDefault;
-use std::hash::poseidon2::Poseidon2Hasher;
+use poseidon::poseidon2::Poseidon2Hasher;
 
 struct Entry{
     key: Field,
     value: Field
 }
 
-global HASHMAP_CAP = 8;
-global HASHMAP_LEN = 6;
+global HASHMAP_CAP: u32 = 8;
+global HASHMAP_LEN: u32 = 6;
 
 fn allocate_hashmap() -> HashMap<Field, Field, HASHMAP_CAP, BuildHasherDefault<Poseidon2Hasher>> {
     HashMap::default()

test_programs/benchmarks/bench_poseidon_hash_100/Nargo.toml

@@ -4,4 +4,5 @@ type = "bin"
 authors = [""]
 compiler_version = ">=0.25.0"
 
-[dependencies]
+[dependencies]
+poseidon = { tag = "v0.1.0", git = "https://github.com/noir-lang/poseidon" }

test_programs/benchmarks/bench_poseidon_hash_100/src/main.nr

@@ -1,16 +1,14 @@
-use std::hash::poseidon2;
-
 global len: u32 = 2450 * 2 - 240; // for just under 2^17 gates
 fn main(x: Field) {
     let ped_input = [x; len];
-    let mut val = poseidon2::Poseidon2::hash(ped_input, len);
+    let mut val = poseidon::poseidon2::Poseidon2::hash(ped_input, len);
     let z = foo(x);
     assert(val == z);
 }
 
 #[fold]
 fn foo(x: Field) -> Field {
     let ped_input = [x; len];
-    let mut val = poseidon2::Poseidon2::hash(ped_input, len);
+    let mut val = poseidon::poseidon2::Poseidon2::hash(ped_input, len);
     val
 }