From eb952736837c6ea9e08666b3e27d26a7de31d66b Mon Sep 17 00:00:00 2001 From: ec2 Date: Wed, 13 Sep 2023 11:07:46 +0000 Subject: [PATCH] rename to sha flex --- lightclient-circuits/src/gadget/crypto/builder.rs | 2 +- lightclient-circuits/src/gadget/crypto/hash2curve.rs | 2 +- lightclient-circuits/src/gadget/crypto/mod.rs | 4 ++-- .../src/gadget/crypto/{sha256.rs => sha256_flex.rs} | 2 +- .../src/gadget/crypto/{sha256 => sha256_flex}/builder.rs | 0 .../src/gadget/crypto/{sha256 => sha256_flex}/compression.rs | 0 .../src/gadget/crypto/{sha256 => sha256_flex}/spread.rs | 0 .../src/gadget/crypto/{sha256 => sha256_flex}/util.rs | 0 lightclient-circuits/src/sync_step_circuit.rs | 2 +- 9 files changed, 6 insertions(+), 6 deletions(-) rename lightclient-circuits/src/gadget/crypto/{sha256.rs => sha256_flex.rs} (99%) rename lightclient-circuits/src/gadget/crypto/{sha256 => sha256_flex}/builder.rs (100%) rename lightclient-circuits/src/gadget/crypto/{sha256 => sha256_flex}/compression.rs (100%) rename lightclient-circuits/src/gadget/crypto/{sha256 => sha256_flex}/spread.rs (100%) rename lightclient-circuits/src/gadget/crypto/{sha256 => sha256_flex}/util.rs (100%) diff --git a/lightclient-circuits/src/gadget/crypto/builder.rs b/lightclient-circuits/src/gadget/crypto/builder.rs index 39466f0a..a05ac3e5 100644 --- a/lightclient-circuits/src/gadget/crypto/builder.rs +++ b/lightclient-circuits/src/gadget/crypto/builder.rs @@ -23,7 +23,7 @@ use crate::{ util::{ThreadBuilderBase, ThreadBuilderConfigBase}, }; -use super::sha256::{assign_threads_sha, SpreadConfig, FIRST_PHASE}; +use super::sha256_flex::{assign_threads_sha, SpreadConfig, FIRST_PHASE}; #[derive(Debug, Clone)] pub struct SHAConfig> { diff --git a/lightclient-circuits/src/gadget/crypto/hash2curve.rs b/lightclient-circuits/src/gadget/crypto/hash2curve.rs index 275bd0a6..b39ef11f 100644 --- a/lightclient-circuits/src/gadget/crypto/hash2curve.rs +++ b/lightclient-circuits/src/gadget/crypto/hash2curve.rs @@ -625,7 +625,7 @@ mod test { use std::vec; use std::{cell::RefCell, marker::PhantomData}; - use crate::gadget::crypto::sha256::{SpreadChip, SpreadConfig}; + use crate::gadget::crypto::sha256_flex::{SpreadChip, SpreadConfig}; use crate::gadget::crypto::ShaCircuitBuilder; use crate::gadget::crypto::{Sha256Chip, ShaThreadBuilder}; use crate::util::{print_fq2_dev, Challenges, IntoWitness}; diff --git a/lightclient-circuits/src/gadget/crypto/mod.rs b/lightclient-circuits/src/gadget/crypto/mod.rs index 60b118d8..2bba9c67 100644 --- a/lightclient-circuits/src/gadget/crypto/mod.rs +++ b/lightclient-circuits/src/gadget/crypto/mod.rs @@ -1,7 +1,7 @@ mod builder; mod ecc; mod hash2curve; -mod sha256; +mod sha256_flex; mod sha256_wide; mod util; @@ -17,7 +17,7 @@ use halo2_ecc::{ use halo2_proofs::plonk::Error; pub use hash2curve::{HashToCurveCache, HashToCurveChip}; use lazy_static::lazy_static; -pub use sha256::{Sha256Chip, ShaContexts, ShaThreadBuilder}; +pub use sha256_flex::{Sha256Chip, ShaContexts, ShaThreadBuilder}; pub use sha256_wide::{Sha256ChipWide, ShaBitThreadBuilder}; pub use ecc::calculate_ysquared; diff --git a/lightclient-circuits/src/gadget/crypto/sha256.rs b/lightclient-circuits/src/gadget/crypto/sha256_flex.rs similarity index 99% rename from lightclient-circuits/src/gadget/crypto/sha256.rs rename to lightclient-circuits/src/gadget/crypto/sha256_flex.rs index 8b6293d0..45105ef5 100644 --- a/lightclient-circuits/src/gadget/crypto/sha256.rs +++ b/lightclient-circuits/src/gadget/crypto/sha256_flex.rs @@ -16,7 +16,7 @@ use sha2::digest::generic_array::GenericArray; use std::collections::HashMap; use std::{cell::RefCell, char::MAX}; -use crate::gadget::crypto::sha256::compression::{sha256_compression, INIT_STATE}; +use crate::gadget::crypto::sha256_flex::compression::{sha256_compression, INIT_STATE}; use crate::util::{AssignedValueCell, ThreadBuilderBase}; use crate::witness::HashInput; use halo2_base::safe_types::RangeChip; diff --git a/lightclient-circuits/src/gadget/crypto/sha256/builder.rs b/lightclient-circuits/src/gadget/crypto/sha256_flex/builder.rs similarity index 100% rename from lightclient-circuits/src/gadget/crypto/sha256/builder.rs rename to lightclient-circuits/src/gadget/crypto/sha256_flex/builder.rs diff --git a/lightclient-circuits/src/gadget/crypto/sha256/compression.rs b/lightclient-circuits/src/gadget/crypto/sha256_flex/compression.rs similarity index 100% rename from lightclient-circuits/src/gadget/crypto/sha256/compression.rs rename to lightclient-circuits/src/gadget/crypto/sha256_flex/compression.rs diff --git a/lightclient-circuits/src/gadget/crypto/sha256/spread.rs b/lightclient-circuits/src/gadget/crypto/sha256_flex/spread.rs similarity index 100% rename from lightclient-circuits/src/gadget/crypto/sha256/spread.rs rename to lightclient-circuits/src/gadget/crypto/sha256_flex/spread.rs diff --git a/lightclient-circuits/src/gadget/crypto/sha256/util.rs b/lightclient-circuits/src/gadget/crypto/sha256_flex/util.rs similarity index 100% rename from lightclient-circuits/src/gadget/crypto/sha256/util.rs rename to lightclient-circuits/src/gadget/crypto/sha256_flex/util.rs diff --git a/lightclient-circuits/src/sync_step_circuit.rs b/lightclient-circuits/src/sync_step_circuit.rs index f86fb4f4..39cb6530 100644 --- a/lightclient-circuits/src/sync_step_circuit.rs +++ b/lightclient-circuits/src/sync_step_circuit.rs @@ -585,7 +585,7 @@ mod tests { #[test] fn test_sync_evm_verify() { - const K: usize = 21; + const K: usize = 22; let (params, pk, break_points) = SyncStepCircuit::::setup(K, None);