Skip to content

Commit 38b442e

Browse files
replaced assert! with anyhow::ensure!
1 parent 75e91fd commit 38b442e

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

crates/proof-compression/src/blob_storage.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ impl FileSystemBlobStorage {
305305
) -> anyhow::Result<
306306
VerificationKey<GoldilocksField, <CS as CompressionStep>::PreviousStepTreeHasher>,
307307
> {
308-
assert!(CS::MODE >= 1);
308+
anyhow::ensure!(CS::MODE >= 1);
309309
let path = if CS::MODE == 1 {
310310
format!("{}/{}_vk.json", Self::DATA_DIR_PATH, Self::SCHEDULER_PREFIX,)
311311
} else {

crates/proof-compression/src/proof_system/boojum.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ where
151151
vk: &Self::VK,
152152
) -> anyhow::Result<Self::Proof> {
153153
let domain_size = vk.fixed_parameters.domain_size as usize;
154-
assert_eq!(finalization_hint.final_trace_len, domain_size);
154+
anyhow::ensure!(finalization_hint.final_trace_len == domain_size);
155155
let cache_strategy = CacheStrategy {
156156
setup_polynomials: PolynomialsCacheStrategy::CacheMonomialsAndFirstCoset,
157157
trace_polynomials: PolynomialsCacheStrategy::CacheMonomialsAndFirstCoset,
@@ -210,7 +210,7 @@ where
210210
proof_config.merkle_tree_cap_size,
211211
);
212212
let domain_size = vk_params.domain_size as usize;
213-
assert_eq!(finalization_hint.final_trace_len, domain_size);
213+
anyhow::ensure!(finalization_hint.final_trace_len == domain_size);
214214
let (precomputation, vk) =
215215
shivini::cs::gpu_setup_and_vk_from_base_setup_vk_params_and_hints::<
216216
CF::ThisLayerHasher,

crates/proof-compression/src/proof_system/fflonk.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ impl SnarkWrapperProofSystem for FflonkSnarkWrapper {
103103
precomputation: &Self::Precomputation,
104104
finalization_hint: &Self::FinalizationHint,
105105
) -> anyhow::Result<Self::Proof> {
106-
assert!(proving_assembly.is_satisfied());
106+
anyhow::ensure!(proving_assembly.is_satisfied());
107107
let raw_trace_len = proving_assembly.n();
108-
assert!(finalization_hint.is_power_of_two());
108+
anyhow::ensure!(finalization_hint.is_power_of_two());
109109
proving_assembly.finalize_to_size_log_2(finalization_hint.trailing_zeros() as usize);
110110
let domain_size = proving_assembly.n() + 1;
111-
assert!(domain_size.is_power_of_two());
112-
assert_eq!(domain_size, finalization_hint.clone());
111+
anyhow::ensure!(domain_size.is_power_of_two());
112+
anyhow::ensure!(domain_size == finalization_hint.clone());
113113
let precomputation = precomputation.into_inner_ref();
114114
let start = std::time::Instant::now();
115115
let proof = ::fflonk::create_proof::<_, _, _, RollingKeccakTranscript<_>, _>(

crates/proof-compression/src/proof_system/plonk.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl PlonkSnarkWrapper {
7878
>,
7979
setup_data_cache: SnarkWrapperSetupData<Self>,
8080
) -> anyhow::Result<<Self as ProofSystemDefinition>::Proof> {
81-
assert!(Self::IS_FFLONK ^ Self::IS_PLONK);
81+
anyhow::ensure!(Self::IS_FFLONK ^ Self::IS_PLONK);
8282
let input_vk = setup_data_cache.previous_vk;
8383
let mut ctx = Self::init_context(&setup_data_cache.crs)?.into_inner();
8484
let finalization_hint = setup_data_cache.finalization_hint;
@@ -88,12 +88,12 @@ impl PlonkSnarkWrapper {
8888
let vk = setup_data_cache.vk;
8989
let mut precomputation = setup_data_cache.precomputation.into_inner();
9090

91-
assert!(proving_assembly.is_satisfied());
92-
assert!(finalization_hint.is_power_of_two());
91+
anyhow::ensure!(proving_assembly.is_satisfied());
92+
anyhow::ensure!(finalization_hint.is_power_of_two());
9393
proving_assembly.finalize_to_size_log_2(finalization_hint.trailing_zeros() as usize);
9494
let domain_size = proving_assembly.n() + 1;
95-
assert!(domain_size.is_power_of_two());
96-
assert_eq!(domain_size, finalization_hint.clone());
95+
anyhow::ensure!(domain_size.is_power_of_two());
96+
anyhow::ensure!(domain_size == finalization_hint.clone());
9797

9898
let worker = bellman::worker::Worker::new();
9999
let start = std::time::Instant::now();
@@ -111,7 +111,7 @@ impl PlonkSnarkWrapper {
111111
println!("plonk proving takes {} s", start.elapsed().as_secs());
112112
ctx.free_all_slots();
113113

114-
assert!(<Self as ProofSystemDefinition>::verify(&proof, &vk));
114+
anyhow::ensure!(<Self as ProofSystemDefinition>::verify(&proof, &vk));
115115

116116
Ok(proof)
117117
}
@@ -130,13 +130,13 @@ impl PlonkSnarkWrapper {
130130
let circuit = Self::build_circuit(input_vk, None);
131131
let mut setup_assembly =
132132
<Self as SnarkWrapperProofSystemExt>::synthesize_for_setup(circuit);
133-
assert!(setup_assembly.is_satisfied());
134-
assert!(hardcoded_finalization_hint.is_power_of_two());
133+
anyhow::ensure!(setup_assembly.is_satisfied());
134+
anyhow::ensure!(hardcoded_finalization_hint.is_power_of_two());
135135
setup_assembly
136136
.finalize_to_size_log_2(hardcoded_finalization_hint.trailing_zeros() as usize);
137137
let domain_size = setup_assembly.n() + 1;
138-
assert!(domain_size.is_power_of_two());
139-
assert_eq!(domain_size, hardcoded_finalization_hint);
138+
anyhow::ensure!(domain_size.is_power_of_two());
139+
anyhow::ensure!(domain_size == hardcoded_finalization_hint);
140140
let mut ctx = Self::init_context(&crs)?.into_inner();
141141

142142
let worker = bellman::worker::Worker::new();

crates/proof-compression/src/step/compression.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub trait CompressionStep: CompressionProofSystem {
8686
&finalization_hint,
8787
&vk,
8888
)?;
89-
assert!(<Self as ProofSystemDefinition>::verify(&proof, &vk));
89+
anyhow::ensure!(<Self as ProofSystemDefinition>::verify(&proof, &vk));
9090

9191
Ok(proof)
9292
}

crates/proof-compression/src/step/snark_wrapper.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub trait SnarkWrapperStep: SnarkWrapperProofSystem {
3232
>;
3333
fn load_finalization_hint() -> anyhow::Result<<Self as ProofSystemDefinition>::FinalizationHint>
3434
{
35-
assert!(Self::IS_FFLONK ^ Self::IS_PLONK);
35+
anyhow::ensure!(Self::IS_FFLONK ^ Self::IS_PLONK);
3636
let hint = if Self::IS_PLONK {
3737
(1 << <PlonkProverDeviceMemoryManagerConfig as gpu_prover::ManagerConfigs>::FULL_SLOT_SIZE_LOG).to_string()
3838
} else {
@@ -75,7 +75,7 @@ pub trait SnarkWrapperStep: SnarkWrapperProofSystem {
7575
input_proof: Proof<GoldilocksField, Self::PreviousStepTreeHasher, GoldilocksExt2>,
7676
setup_data_cache: &SnarkWrapperSetupData<Self>,
7777
) -> anyhow::Result<<Self as ProofSystemDefinition>::Proof> {
78-
assert!(Self::IS_FFLONK ^ Self::IS_PLONK);
78+
anyhow::ensure!(Self::IS_FFLONK ^ Self::IS_PLONK);
7979
let input_vk = &setup_data_cache.previous_vk;
8080
let crs = &setup_data_cache.crs;
8181
let ctx = Self::init_context(&crs)?;
@@ -92,7 +92,7 @@ pub trait SnarkWrapperStep: SnarkWrapperProofSystem {
9292
finalization_hint,
9393
)?;
9494

95-
assert!(<Self as ProofSystemDefinition>::verify(&proof, &vk));
95+
anyhow::ensure!(<Self as ProofSystemDefinition>::verify(&proof, &vk));
9696

9797
Ok(proof)
9898
}

0 commit comments

Comments
 (0)