diff --git a/fil-proofs-tooling/src/bin/settings/main.rs b/fil-proofs-tooling/src/bin/settings/main.rs index c9b33305b..041369001 100644 --- a/fil-proofs-tooling/src/bin/settings/main.rs +++ b/fil-proofs-tooling/src/bin/settings/main.rs @@ -1,65 +1,47 @@ use anyhow::Result; -use storage_proofs::settings; +use storage_proofs::settings::{Settings, SETTINGS}; fn main() -> Result<()> { - println!( - "parameter_cache: {}", - settings::SETTINGS.lock().unwrap().parameter_cache - ); - println!( - "maximize_caching: {}", - settings::SETTINGS.lock().unwrap().maximize_caching - ); - println!( - "parent_cache: {}", - settings::SETTINGS.lock().unwrap().parent_cache - ); - println!( - "sdr_parents_cache_size: {}", - settings::SETTINGS.lock().unwrap().sdr_parents_cache_size - ); + let Settings { + parameter_cache, + maximize_caching, + parent_cache, + sdr_parents_cache_size, + use_gpu_column_builder, + max_gpu_column_batch_size, + column_write_batch_size, + use_gpu_tree_builder, + max_gpu_tree_batch_size, + rows_to_discard, + window_post_synthesis_num_cpus, + pedersen_hash_exp_window_size, + use_fil_blst, + } = &*SETTINGS.lock().unwrap(); - println!( - "use_gpu_column_builder: {}", - settings::SETTINGS.lock().unwrap().use_gpu_column_builder - ); - println!( - "max_gpu_column_batch_size: {}", - settings::SETTINGS.lock().unwrap().max_gpu_column_batch_size - ); - println!( - "column_write_batch_size: {}", - settings::SETTINGS.lock().unwrap().column_write_batch_size - ); + println!("parameter_cache: {}", parameter_cache); + println!("maximize_caching: {}", maximize_caching); + println!("parent_cache: {}", parent_cache); + println!("sdr_parents_cache_size: {}", sdr_parents_cache_size); - println!( - "use_gpu_tree_builder: {}", - settings::SETTINGS.lock().unwrap().use_gpu_tree_builder - ); - println!( - "max_gpu_tree_batch_size: {}", - settings::SETTINGS.lock().unwrap().max_gpu_tree_batch_size - ); + println!("use_gpu_column_builder: {}", use_gpu_column_builder); + println!("max_gpu_column_batch_size: {}", max_gpu_column_batch_size); + println!("column_write_batch_size: {}", column_write_batch_size); - println!( - "rows_to_discard: {}", - settings::SETTINGS.lock().unwrap().rows_to_discard - ); + println!("use_gpu_tree_builder: {}", use_gpu_tree_builder); + println!("max_gpu_tree_batch_size: {}", max_gpu_tree_batch_size); + + println!("rows_to_discard: {}", rows_to_discard); println!( "window_post_synthesis_num_cpus: {}", - settings::SETTINGS - .lock() - .unwrap() - .window_post_synthesis_num_cpus + window_post_synthesis_num_cpus ); println!( "pedersen_hash_exp_window_size: {}", - settings::SETTINGS - .lock() - .unwrap() - .pedersen_hash_exp_window_size + pedersen_hash_exp_window_size ); + println!("use_fil_blst: {}", use_fil_blst); + Ok(()) }