From 8951bf977effce71c593a35246288e261db6af2f Mon Sep 17 00:00:00 2001 From: nemo Date: Mon, 18 Oct 2021 12:30:43 -0400 Subject: [PATCH] feat: reduce verbose info logging --- filecoin-proofs/src/api/mod.rs | 9 +++++---- filecoin-proofs/src/api/seal.rs | 26 +++++++++++++------------- filecoin-proofs/src/pieces.rs | 4 ++-- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/filecoin-proofs/src/api/mod.rs b/filecoin-proofs/src/api/mod.rs index 8c16bb72c..7d0d6a30d 100644 --- a/filecoin-proofs/src/api/mod.rs +++ b/filecoin-proofs/src/api/mod.rs @@ -275,7 +275,7 @@ where W: Write, Tree: 'static + MerkleTreeTrait, { - info!("unseal_range_inner:start"); + trace!("unseal_range_inner:start"); let base_tree_size = get_base_tree_size::(porep_config.sector_size)?; let base_tree_leafs = get_base_tree_leafs::(base_tree_size)?; @@ -310,7 +310,7 @@ where let amount = UnpaddedBytesAmount(written as u64); - info!("unseal_range_inner:finish"); + trace!("unseal_range_inner:finish"); Ok(amount) } @@ -376,7 +376,7 @@ where R: Read, W: Write, { - info!("add_piece:start"); + trace!("add_piece:start"); let result = measure_op(Operation::AddPiece, || { ensure_piece_size(piece_size)?; @@ -417,7 +417,7 @@ where Ok((PieceInfo::new(comm, n)?, written)) }); - info!("add_piece:finish"); + trace!("add_piece:finish"); result } @@ -705,5 +705,6 @@ where verify_level_cache_store::(&t_aux.tree_r_last_config)?; info!("validate_cache_for_precommit:finish"); + Ok(()) } diff --git a/filecoin-proofs/src/api/seal.rs b/filecoin-proofs/src/api/seal.rs index a19419f94..e12a56564 100644 --- a/filecoin-proofs/src/api/seal.rs +++ b/filecoin-proofs/src/api/seal.rs @@ -128,7 +128,7 @@ where _, >>::setup(&compound_setup_params)?; - info!("building merkle tree for the original data"); + trace!("building merkle tree for the original data"); let (config, comm_d) = measure_op(Operation::CommD, || -> Result<_> { let base_tree_size = get_base_tree_size::(porep_config.sector_size)?; let base_tree_leafs = get_base_tree_leafs::(base_tree_size)?; @@ -166,7 +166,7 @@ where Ok((config, comm_d)) })?; - info!("verifying pieces"); + trace!("verifying pieces"); ensure!( verify_pieces(&comm_d, piece_infos, porep_config.into())?, @@ -485,7 +485,7 @@ pub fn seal_commit_phase2( let groth_params = get_stacked_params::(porep_config)?; - info!( + trace!( "got groth params ({}) while sealing", u64::from(PaddedBytesAmount::from(porep_config)) ); @@ -506,7 +506,7 @@ pub fn seal_commit_phase2( _, >>::setup(&compound_setup_params)?; - info!("snark_proof:start"); + trace!("snark_proof:start"); let groth_proofs = StackedCompound::::circuit_proofs( &public_inputs, vanilla_proofs, @@ -514,7 +514,7 @@ pub fn seal_commit_phase2( &groth_params, compound_public_params.priority, )?; - info!("snark_proof:finish"); + trace!("snark_proof:finish"); let proof = MultiProof::new(groth_proofs, &groth_params.pvk); @@ -569,7 +569,7 @@ pub fn get_seal_inputs( ticket: Ticket, seed: Ticket, ) -> Result>> { - info!("get_seal_inputs:start"); + trace!("get_seal_inputs:start"); ensure!(comm_d != [0; 32], "Invalid all zero commitment (comm_d)"); ensure!(comm_r != [0; 32], "Invalid all zero commitment (comm_r)"); @@ -628,7 +628,7 @@ pub fn get_seal_inputs( }) .collect::>()?; - info!("get_seal_inputs:finish"); + trace!("get_seal_inputs:finish"); Ok(inputs) } @@ -871,7 +871,7 @@ pub fn verify_aggregate_seal_commit_proofs( hasher.finalize().into() }; - info!("start verifying aggregate proof"); + trace!("start verifying aggregate proof"); let result = StackedCompound::::verify_aggregate_proofs( &srs_verifier_key, &verifying_key, @@ -879,7 +879,7 @@ pub fn verify_aggregate_seal_commit_proofs( commit_inputs.as_slice(), &aggregate_proof, )?; - info!("end verifying aggregate proof"); + trace!("end verifying aggregate proof"); info!("verify_aggregate_seal_commit_proofs:finish"); @@ -893,11 +893,11 @@ pub fn verify_aggregate_seal_commit_proofs( /// * `porep_config` - this sector's porep config that contains the number of bytes in the sector. /// * `piece_infos` - the piece info (commitment and byte length) for each piece in this sector. pub fn compute_comm_d(sector_size: SectorSize, piece_infos: &[PieceInfo]) -> Result { - info!("compute_comm_d:start"); + trace!("compute_comm_d:start"); let result = pieces::compute_comm_d(sector_size, piece_infos); - info!("compute_comm_d:finish"); + trace!("compute_comm_d:finish"); result } @@ -969,7 +969,7 @@ pub fn verify_seal( let sector_bytes = PaddedBytesAmount::from(porep_config); let verifying_key = get_stacked_verifying_key::(porep_config)?; - info!( + trace!( "got verifying key ({}) while verifying seal", u64::from(sector_bytes) ); @@ -1051,7 +1051,7 @@ pub fn verify_batch_seal( let sector_bytes = PaddedBytesAmount::from(porep_config); let verifying_key = get_stacked_verifying_key::(porep_config)?; - info!( + trace!( "got verifying key ({}) while verifying seal", u64::from(sector_bytes) ); diff --git a/filecoin-proofs/src/pieces.rs b/filecoin-proofs/src/pieces.rs index 7769c5c62..0c0fed257 100644 --- a/filecoin-proofs/src/pieces.rs +++ b/filecoin-proofs/src/pieces.rs @@ -8,7 +8,7 @@ use anyhow::{ensure, Context, Result}; use filecoin_hashers::{HashFunction, Hasher}; use fr32::Fr32Reader; use lazy_static::lazy_static; -use log::info; +use log::trace; use storage_proofs_core::util::NODE_SIZE; use crate::{ @@ -83,7 +83,7 @@ fn empty_comm_d(sector_size: SectorSize) -> Commitment { } pub fn compute_comm_d(sector_size: SectorSize, piece_infos: &[PieceInfo]) -> Result { - info!("verifying {} pieces", piece_infos.len()); + trace!("verifying {} pieces", piece_infos.len()); if piece_infos.is_empty() { return Ok(empty_comm_d(sector_size)); }