refactor: use a single utils crate

Author: TomWambsgans

Cargo.lock

@@ -53,7 +53,6 @@ wildcard_imports = "allow"
 
 [workspace.dependencies]
 # Local
-utils = { path = "crates/utils" }
 lean_vm = { path = "crates/lean_vm" }
 xmss = { path = "crates/xmss" }
 sub_protocols = { path = "crates/sub_protocols" }
@@ -91,7 +90,6 @@ rec_aggregation.workspace = true
 zk-alloc.workspace = true
 rand.workspace = true
 sub_protocols.workspace = true
-utils.workspace = true
 lean_vm.workspace = true
 xmss.workspace = true
 backend.workspace = true

Cargo.toml

@@ -14,4 +14,4 @@ whir = { path = "../whir", package = "mt-whir" }
 tracing.workspace = true
 fiat-shamir = { path = "fiat-shamir", package = "mt-fiat-shamir" }
 koala-bear = { path = "koala-bear", package = "mt-koala-bear" }
-utils = { path = "utils", package = "mt-utils" }
+utils = { path = "utils", package = "utils" }

crates/backend/Cargo.toml

@@ -7,7 +7,7 @@ edition.workspace = true
 field = { path = "../field", package = "mt-field" }
 koala-bear = { path = "../koala-bear", package = "mt-koala-bear" }
 symetric = { path = "../symetric", package = "mt-symetric" }
-utils = { path = "../utils", package = "mt-utils" }
+utils = { path = "../utils", package = "utils" }
 tracing.workspace = true
 serde.workspace = true
 rayon.workspace = true

crates/backend/fiat-shamir/Cargo.toml

@@ -1,9 +1,6 @@
 use field::PrimeField64;
 use koala_bear::symmetric::Permutation;
-
-pub const RATE: usize = 8;
-pub const WIDTH: usize = RATE * 2;
-pub const CAPACITY: usize = WIDTH - RATE;
+use symetric::{CAPACITY, RATE, WIDTH};
 
 #[derive(Clone, Debug)]
 pub struct Challenger<F, P> {

crates/backend/fiat-shamir/src/challenger.rs

@@ -8,7 +8,6 @@ mod utils;
 pub use utils::*;
 
 mod challenger;
-pub use challenger::{CAPACITY, RATE, WIDTH};
 
 mod traits;
 pub use traits::*;

crates/backend/fiat-shamir/src/lib.rs

@@ -1,8 +1,5 @@
-use crate::{
-    MerklePaths, PrunedMerklePaths,
-    challenger::{CAPACITY, Challenger, RATE, WIDTH},
-    *,
-};
+use crate::challenger::Challenger;
+use crate::{MerklePaths, PrunedMerklePaths, *};
 use field::Field;
 use field::PackedValue;
 use field::PrimeCharacteristicRing;
@@ -13,6 +10,9 @@ use rayon::prelude::*;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::time::Duration;
 use std::{fmt::Debug, sync::Mutex, time::Instant};
+use symetric::CAPACITY;
+use symetric::RATE;
+use symetric::WIDTH;
 
 static POW_GRINDING_NANOS: AtomicU64 = AtomicU64::new(0);
 

crates/backend/fiat-shamir/src/prover.rs

@@ -1,7 +1,8 @@
 use field::{BasedVectorSpace, ExtensionField, Field, PrimeCharacteristicRing, PrimeField64};
 use koala_bear::symmetric::Permutation;
+use symetric::{RATE, WIDTH};
 
-use crate::challenger::{Challenger, RATE, WIDTH};
+use crate::challenger::Challenger;
 
 pub(crate) type PF<F> = <F as PrimeCharacteristicRing>::PrimeSubfield;
 

crates/backend/fiat-shamir/src/utils.rs

@@ -1,17 +1,19 @@
-use std::any::TypeId;
-use std::collections::VecDeque;
-use std::iter::repeat_n;
-
+use crate::challenger::Challenger;
 use crate::{
     MerkleOpening, MerklePaths, PrunedMerklePaths, RawProof,
-    challenger::{CAPACITY, Challenger, RATE, WIDTH},
     transcript::{DIGEST_LEN_FE, Proof},
     *,
 };
 use field::PrimeCharacteristicRing;
 use field::{ExtensionField, PrimeField64};
 use koala_bear::symmetric::Permutation;
 use koala_bear::{KoalaBear, default_koalabear_poseidon1_16};
+use std::any::TypeId;
+use std::collections::VecDeque;
+use std::iter::repeat_n;
+use symetric::CAPACITY;
+use symetric::RATE;
+use symetric::WIDTH;
 
 pub struct VerifierState<EF: ExtensionField<PF<EF>>, P> {
     challenger: Challenger<PF<EF>, P>,

crates/backend/fiat-shamir/src/verifier.rs

@@ -4,7 +4,7 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-utils = { path = "../utils", package = "mt-utils" }
+utils = { path = "../utils", package = "utils" }
 
 itertools.workspace = true
 num-bigint = "*"