From 005157e76fc100da1f93113418553218e02ce89d Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Mon, 16 Oct 2023 16:08:19 +0300 Subject: [PATCH] Replace `.unwrap()` with `.expect()` --- crates/pallet-subspace/src/mock.rs | 3 ++- crates/sp-lightclient/src/tests.rs | 3 ++- crates/subspace-farmer-components/benches/auditing.rs | 3 ++- crates/subspace-farmer-components/benches/plotting.rs | 3 ++- crates/subspace-farmer-components/benches/proving.rs | 3 ++- crates/subspace-farmer-components/benches/reading.rs | 3 ++- .../src/bin/subspace-farmer/commands/benchmark.rs | 3 ++- .../subspace-farmer/src/bin/subspace-farmer/commands/farm.rs | 3 ++- test/subspace-test-client/src/lib.rs | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/crates/pallet-subspace/src/mock.rs b/crates/pallet-subspace/src/mock.rs index 79df65025a..f601546d90 100644 --- a/crates/pallet-subspace/src/mock.rs +++ b/crates/pallet-subspace/src/mock.rs @@ -80,7 +80,8 @@ fn erasure_coding_instance() -> &'static ErasureCoding { ERASURE_CODING.get_or_init(|| { ErasureCoding::new( - NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize).unwrap(), + NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize) + .expect("Not zero; qed"), ) .unwrap() }) diff --git a/crates/sp-lightclient/src/tests.rs b/crates/sp-lightclient/src/tests.rs index 08dc0d9a4d..dd6dd5ca7a 100644 --- a/crates/sp-lightclient/src/tests.rs +++ b/crates/sp-lightclient/src/tests.rs @@ -45,7 +45,8 @@ fn erasure_coding_instance() -> &'static ErasureCoding { ERASURE_CODING.get_or_init(|| { ErasureCoding::new( - NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize).unwrap(), + NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize) + .expect("Not zero; qed"), ) .unwrap() }) diff --git a/crates/subspace-farmer-components/benches/auditing.rs b/crates/subspace-farmer-components/benches/auditing.rs index 03b594f9cc..b6badd9271 100644 --- a/crates/subspace-farmer-components/benches/auditing.rs +++ b/crates/subspace-farmer-components/benches/auditing.rs @@ -52,7 +52,8 @@ pub fn criterion_benchmark(c: &mut Criterion) { let kzg = Kzg::new(kzg::embedded_kzg_settings()); let mut archiver = Archiver::new(kzg.clone()).unwrap(); let erasure_coding = ErasureCoding::new( - NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize).unwrap(), + NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize) + .expect("Not zero; qed"), ) .unwrap(); let mut table_generator = PosTable::generator(); diff --git a/crates/subspace-farmer-components/benches/plotting.rs b/crates/subspace-farmer-components/benches/plotting.rs index d11bdb659c..e5d305773b 100644 --- a/crates/subspace-farmer-components/benches/plotting.rs +++ b/crates/subspace-farmer-components/benches/plotting.rs @@ -33,7 +33,8 @@ fn criterion_benchmark(c: &mut Criterion) { let kzg = Kzg::new(kzg::embedded_kzg_settings()); let mut archiver = Archiver::new(kzg.clone()).unwrap(); let erasure_coding = ErasureCoding::new( - NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize).unwrap(), + NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize) + .expect("Not zero; qed"), ) .unwrap(); let mut table_generator = PosTable::generator(); diff --git a/crates/subspace-farmer-components/benches/proving.rs b/crates/subspace-farmer-components/benches/proving.rs index bb78b7554d..1d706cfd1e 100644 --- a/crates/subspace-farmer-components/benches/proving.rs +++ b/crates/subspace-farmer-components/benches/proving.rs @@ -55,7 +55,8 @@ pub fn criterion_benchmark(c: &mut Criterion) { let kzg = Kzg::new(kzg::embedded_kzg_settings()); let mut archiver = Archiver::new(kzg.clone()).unwrap(); let erasure_coding = ErasureCoding::new( - NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize).unwrap(), + NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize) + .expect("Not zero; qed"), ) .unwrap(); let mut table_generator = PosTable::generator(); diff --git a/crates/subspace-farmer-components/benches/reading.rs b/crates/subspace-farmer-components/benches/reading.rs index 6b1ded117d..00456003c7 100644 --- a/crates/subspace-farmer-components/benches/reading.rs +++ b/crates/subspace-farmer-components/benches/reading.rs @@ -51,7 +51,8 @@ pub fn criterion_benchmark(c: &mut Criterion) { let kzg = Kzg::new(kzg::embedded_kzg_settings()); let mut archiver = Archiver::new(kzg.clone()).unwrap(); let erasure_coding = ErasureCoding::new( - NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize).unwrap(), + NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize) + .expect("Not zero; qed"), ) .unwrap(); let mut table_generator = PosTable::generator(); diff --git a/crates/subspace-farmer/src/bin/subspace-farmer/commands/benchmark.rs b/crates/subspace-farmer/src/bin/subspace-farmer/commands/benchmark.rs index 52ed3a1836..56ab2af2c1 100644 --- a/crates/subspace-farmer/src/bin/subspace-farmer/commands/benchmark.rs +++ b/crates/subspace-farmer/src/bin/subspace-farmer/commands/benchmark.rs @@ -80,7 +80,8 @@ async fn audit(disk_farm: PathBuf, sample_size: usize) -> anyhow::Result<()> { let sector_size = sector_size(single_disk_farm_info.pieces_in_sector()); let kzg = Kzg::new(embedded_kzg_settings()); let erasure_coding = ErasureCoding::new( - NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize).unwrap(), + NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize) + .expect("Not zero; qed"), ) .map_err(|error| anyhow::anyhow!(error))?; let table_generator = Mutex::new(PosTable::generator()); diff --git a/crates/subspace-farmer/src/bin/subspace-farmer/commands/farm.rs b/crates/subspace-farmer/src/bin/subspace-farmer/commands/farm.rs index e935c309c5..3b59dde084 100644 --- a/crates/subspace-farmer/src/bin/subspace-farmer/commands/farm.rs +++ b/crates/subspace-farmer/src/bin/subspace-farmer/commands/farm.rs @@ -369,7 +369,8 @@ where let kzg = Kzg::new(embedded_kzg_settings()); let erasure_coding = ErasureCoding::new( - NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize).unwrap(), + NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize) + .expect("Not zero; qed"), ) .map_err(|error| anyhow::anyhow!(error))?; // TODO: Consider introducing and using global in-memory segment header cache (this comment is diff --git a/test/subspace-test-client/src/lib.rs b/test/subspace-test-client/src/lib.rs index dd1e749768..853d6b9949 100644 --- a/test/subspace-test-client/src/lib.rs +++ b/test/subspace-test-client/src/lib.rs @@ -148,7 +148,8 @@ async fn start_farming( let kzg = Kzg::new(embedded_kzg_settings()); let erasure_coding = ErasureCoding::new( - NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize).unwrap(), + NonZeroUsize::new(Record::NUM_S_BUCKETS.next_power_of_two().ilog2() as usize) + .expect("Not zero; qed"), ) .unwrap();