refactor: switch to anyhow from failure (#956)

refactor: switch to anyhow from failure

Author: dignifiedquire

fil-proofs-tooling/Cargo.toml

@@ -14,7 +14,6 @@ clap = "2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 toml = "0.5"
-failure = "0.1"
 permutate = "0.3"
 lazy_static = "1.2"
 glob = "0.3"
@@ -24,7 +23,7 @@ regex = "1.1.6"
 commandspec = "0.12.2"
 chrono = { version = "0.4.7", features = ["serde"] }
 memmap = "0.7.0"
-bellperson = "0.4.0"
+bellperson = "0.4.1"
 paired = "0.16.0"
 fil-sapling-crypto = "0.2.0"
 rand = "0.7"
@@ -40,8 +39,9 @@ blake2s_simd = "0.5.6"
 pretty_env_logger = "0.3.1"
 log = "0.4.8"
 uom = "0.25.0"
-merkletree = "0.12.2"
+merkletree = "0.13.0"
 bincode = "1.1.2"
+anyhow = "1.0.23"
 
 [features]
 default = ["gpu"]

fil-proofs-tooling/src/bin/benchy/election_post.rs

@@ -52,7 +52,7 @@ impl Report {
     }
 }
 
-pub fn run(sector_size: usize, window_size_nodes: usize) -> Result<(), failure::Error> {
+pub fn run(sector_size: usize, window_size_nodes: usize) -> anyhow::Result<()> {
     info!(
         "Benchy Election PoSt: sector-size={} - window_size={}",
         sector_size,

fil-proofs-tooling/src/bin/benchy/hash_fns.rs

@@ -9,7 +9,7 @@ use storage_proofs::crypto;
 use storage_proofs::crypto::pedersen::JJ_PARAMS;
 use storage_proofs::util::{bits_to_bytes, bytes_into_boolean_vec, bytes_into_boolean_vec_be};
 
-fn blake2s_count(bytes: usize) -> Result<Report, failure::Error> {
+fn blake2s_count(bytes: usize) -> anyhow::Result<Report> {
     let rng = &mut rand::thread_rng();
 
     let mut cs = TestConstraintSystem::<Bls12>::new();
@@ -44,7 +44,7 @@ fn blake2s_count(bytes: usize) -> Result<Report, failure::Error> {
     })
 }
 
-fn sha256_count(bytes: usize) -> Result<Report, failure::Error> {
+fn sha256_count(bytes: usize) -> anyhow::Result<Report> {
     let mut rng = rand::thread_rng();
 
     let mut cs = TestConstraintSystem::<Bls12>::new();
@@ -70,7 +70,7 @@ fn sha256_count(bytes: usize) -> Result<Report, failure::Error> {
     })
 }
 
-fn pedersen_count(bytes: usize) -> Result<Report, failure::Error> {
+fn pedersen_count(bytes: usize) -> anyhow::Result<Report> {
     let mut rng = rand::thread_rng();
 
     let mut cs = TestConstraintSystem::<Bls12>::new();
@@ -119,7 +119,7 @@ struct Report {
     bytes: usize,
 }
 
-pub fn run() -> Result<(), failure::Error> {
+pub fn run() -> anyhow::Result<()> {
     let reports = vec![
         blake2s_count(32)?,
         blake2s_count(64)?,

fil-proofs-tooling/src/bin/benchy/stacked.rs

@@ -2,9 +2,9 @@ use std::fs::{File, OpenOptions};
 use std::time::Duration;
 use std::{io, u32};
 
+use anyhow::bail;
 use bellperson::Circuit;
 use chrono::Utc;
-use failure::bail;
 use log::info;
 use memmap::MmapMut;
 use memmap::MmapOptions;
@@ -25,7 +25,7 @@ use storage_proofs::stacked::{
 };
 use tempfile::TempDir;
 
-fn file_backed_mmap_from_zeroes(n: usize, use_tmp: bool) -> Result<MmapMut, failure::Error> {
+fn file_backed_mmap_from_zeroes(n: usize, use_tmp: bool) -> anyhow::Result<MmapMut> {
     let file: File = if use_tmp {
         tempfile::tempfile().unwrap()
     } else {
@@ -46,7 +46,7 @@ fn file_backed_mmap_from_zeroes(n: usize, use_tmp: bool) -> Result<MmapMut, fail
 
 fn dump_proof_bytes<H: Hasher>(
     all_partition_proofs: &[stacked::Proof<H, Sha256Hasher>],
-) -> Result<(), failure::Error> {
+) -> anyhow::Result<()> {
     let file = OpenOptions::new()
         .write(true)
         .create(true)
@@ -90,10 +90,7 @@ impl From<Params> for Inputs {
     }
 }
 
-fn generate_report<H: 'static>(
-    params: Params,
-    cache_dir: &TempDir,
-) -> Result<Report, failure::Error>
+fn generate_report<H: 'static>(params: Params, cache_dir: &TempDir) -> anyhow::Result<Report>
 where
     H: Hasher,
 {
@@ -220,7 +217,6 @@ where
                     &priv_inputs,
                     *partitions,
                 )
-                .map_err(|err| err.into())
             })?;
 
             report.outputs.vanilla_proving_wall_time_us =
@@ -296,7 +292,6 @@ where
                         &data,
                         Some(store_config.clone()),
                     )
-                    .map_err(|err| err.into())
                 })?;
 
                 assert_ne!(&(*data), m.return_value.as_slice());
@@ -331,7 +326,7 @@ fn do_circuit_work<H: 'static + Hasher>(
     priv_in: Option<<StackedDrg<H, Sha256Hasher> as ProofScheme>::PrivateInputs>,
     params: &Params,
     report: &mut Report,
-) -> Result<CircuitWorkMeasurement, failure::Error> {
+) -> anyhow::Result<CircuitWorkMeasurement> {
     let mut proving_wall_time = Duration::new(0, 0);
     let mut proving_cpu_time = Duration::new(0, 0);
 
@@ -382,7 +377,6 @@ fn do_circuit_work<H: 'static + Hasher>(
                 return_value,
             } = measure(|| {
                 StackedCompound::prove(&compound_public_params, &pub_inputs, &priv_inputs, &gparams)
-                    .map_err(|err| err.into())
             })?;
             proving_wall_time += wall_time;
             proving_cpu_time += cpu_time;
@@ -405,7 +399,6 @@ fn do_circuit_work<H: 'static + Hasher>(
                             minimum_challenges: 1,
                         },
                     )
-                    .map_err(|err| err.into())
                 })?;
 
                 // If one verification fails, result becomes permanently false.
@@ -503,7 +496,7 @@ pub struct RunOpts {
     pub size: usize,
 }
 
-pub fn run(opts: RunOpts) -> Result<(), failure::Error> {
+pub fn run(opts: RunOpts) -> anyhow::Result<()> {
     let config = StackedConfig::new(opts.layers, opts.window_challenges, opts.wrapper_challenges);
 
     let params = Params {

fil-proofs-tooling/src/bin/micro.rs

@@ -1,14 +1,15 @@
 #[macro_use]
 extern crate commandspec;
 #[macro_use]
-extern crate failure;
+extern crate anyhow;
 #[macro_use]
 extern crate serde;
 
-use regex::Regex;
 use std::io::{self, BufRead};
 
+use anyhow::Result;
 use fil_proofs_tooling::metadata::Metadata;
+use regex::Regex;
 
 #[derive(Debug, Default, Clone, PartialEq, Serialize)]
 #[serde(rename_all = "kebab-case")]
@@ -47,7 +48,7 @@ fn make_detail_re(name: &str) -> Regex {
 }
 
 /// Parses the output of `cargo bench -p storage-proofs --bench <benchmark> -- --verbose --colors never`.
-fn parse_criterion_out(s: impl AsRef<str>) -> Result<Vec<CriterionResult>, failure::Error> {
+fn parse_criterion_out(s: impl AsRef<str>) -> Result<Vec<CriterionResult>> {
     let mut res = Vec::new();
 
     let start_re = Regex::new(r"^Benchmarking ([^:]+)$").expect("invalid regex");
@@ -258,7 +259,7 @@ fn time_to_us(s: &str) -> f64 {
     (normalized * 10000.0).round() / 10000.0
 }
 
-fn run_benches(mut args: Vec<String>) -> Result<(), failure::Error> {
+fn run_benches(mut args: Vec<String>) -> Result<()> {
     let is_verbose = if let Some(index) = args.iter().position(|a| a.as_str() == "--verbose") {
         args.remove(index);
         true
@@ -271,7 +272,8 @@ fn run_benches(mut args: Vec<String>) -> Result<(), failure::Error> {
         cargo bench -p storage-proofs {args} -- --verbose --color never
     ",
         args = args
-    )?;
+    )
+    .map_err(|err| anyhow!("{:?}", err))?;
 
     let process = cmd.stdout(std::process::Stdio::piped()).spawn()?;
 

fil-proofs-tooling/src/measure.rs

@@ -1,5 +1,6 @@
 use std::time::{Duration, Instant};
 
+use anyhow::Result;
 use cpu_time::ProcessTime;
 
 pub struct FuncMeasurement<T> {
@@ -8,9 +9,9 @@ pub struct FuncMeasurement<T> {
     pub return_value: T,
 }
 
-pub fn measure<T, F>(f: F) -> Result<FuncMeasurement<T>, failure::Error>
+pub fn measure<T, F>(f: F) -> Result<FuncMeasurement<T>>
 where
-    F: FnOnce() -> Result<T, failure::Error>,
+    F: FnOnce() -> Result<T>,
 {
     let cpu_time_start = ProcessTime::now();
     let wall_start_time = Instant::now();

fil-proofs-tooling/src/metadata.rs

@@ -1,5 +1,5 @@
+use anyhow::{anyhow, Result};
 use chrono::{DateTime, TimeZone, Utc};
-use failure::Error;
 use git2::Repository;
 use serde::Serialize;
 
@@ -13,7 +13,7 @@ pub struct Metadata<T> {
 }
 
 impl<T> Metadata<T> {
-    pub fn wrap(benchmarks: T) -> Result<Self, failure::Error> {
+    pub fn wrap(benchmarks: T) -> Result<Self> {
         Ok(Metadata {
             git: GitMetadata::new()?,
             system: SystemMetadata::new()?,
@@ -31,7 +31,7 @@ pub struct GitMetadata {
 }
 
 impl GitMetadata {
-    pub fn new() -> Result<Self, Error> {
+    pub fn new() -> Result<Self> {
         let repo_path = if let Ok(mdir) = std::env::var("CARGO_MANIFEST_DIR") {
             std::path::Path::new(&mdir).into()
         } else {
@@ -66,19 +66,17 @@ pub struct SystemMetadata {
 }
 
 impl SystemMetadata {
-    pub fn new() -> Result<Self, Error> {
+    pub fn new() -> Result<Self> {
         let host = futures::executor::block_on(heim::host::platform())
-            .map_err(|_| failure::format_err!("Failed to retrieve host information"))?;
+            .map_err(|_| anyhow!("Failed to retrieve host information"))?;
 
         let memory = futures::executor::block_on(heim::memory::memory())
-            .map_err(|_| failure::format_err!("Failed to retrieve memory information"))?;
-        let cpu_logical =
-            futures::executor::block_on(heim::cpu::logical_count()).map_err(|_| {
-                failure::format_err!("Failed to retrieve cpu logical count information")
-            })?;
+            .map_err(|_| anyhow!("Failed to retrieve memory information"))?;
+        let cpu_logical = futures::executor::block_on(heim::cpu::logical_count())
+            .map_err(|_| anyhow!("Failed to retrieve cpu logical count information"))?;
+
         let cpu_physical = futures::executor::block_on(heim::cpu::physical_count())
-            .map_err(|_| failure::format_err!("Failed to retrieve cpu physical count information"))?
-            .unwrap_or_default();
+            .map_err(|_| anyhow!("Failed to retrieve cpu physical count information"))?;
 
         let cpuid = raw_cpuid::CpuId::new();
         let processor = cpuid
@@ -108,7 +106,7 @@ impl SystemMetadata {
                 .map(|info| format!("{:?}", info))
                 .unwrap_or_default(),
             processor_cores_logical: cpu_logical,
-            processor_cores_physical: cpu_physical,
+            processor_cores_physical: cpu_physical.unwrap_or_default(),
             memory_total_bytes: memory.total().get::<uom::si::information::byte>(),
         })
     }

filecoin-proofs/Cargo.toml

@@ -13,7 +13,6 @@ storage-proofs = { version = "^0.6", path = "../storage-proofs" }
 bitvec = "0.5"
 chrono = "0.4"
 rand = "0.7"
-failure = "0.1"
 lazy_static = "1.2"
 memmap = "0.7"
 colored = "1.6"
@@ -27,7 +26,7 @@ serde_json = "1.0"
 regex = "1"
 ff = "0.5.0"
 blake2b_simd = "0.5"
-bellperson = "0.4.0"
+bellperson = "0.4.1"
 paired = "0.16.0"
 fil-sapling-crypto = "0.2.0"
 clap = "2"
@@ -42,8 +41,9 @@ blake2s_simd = "0.5.8"
 hex = "0.4.0"
 tee = "0.1.0"
 os_pipe = "0.9.1"
-merkletree = "0.12.2"
+merkletree = "0.13.0"
 bincode = "1.1.2"
+anyhow = "1.0.23"
 
 [dependencies.reqwest]
 version = "0.9"
@@ -57,6 +57,7 @@ rexpect = "0.3.0"
 pretty_env_logger = "0.3.1"
 pretty_assertions = "0.6.1"
 rand_xorshift = "0.2.0"
+failure = "0.1"
 
 [features]
 default = ["gpu"]

filecoin-proofs/src/api/mod.rs

@@ -2,6 +2,7 @@ use std::fs::File;
 use std::io::{BufWriter, Read, Seek, SeekFrom, Write};
 use std::path::{Path, PathBuf};
 
+use anyhow::Result;
 use merkletree::store::{StoreConfig, DEFAULT_CACHED_ABOVE_BASE_LAYER};
 use storage_proofs::drgraph::DefaultTreeHasher;
 use storage_proofs::hasher::Hasher;
@@ -14,7 +15,6 @@ use crate::constants::{
     DefaultPieceHasher,
     MINIMUM_RESERVED_BYTES_FOR_PIECE_IN_FULLY_ALIGNED_SECTOR as MINIMUM_PIECE_SIZE,
 };
-use crate::error;
 use crate::fr32::{write_padded, write_unpadded};
 use crate::parameters::public_params;
 use crate::pieces::get_aligned_source;
@@ -48,7 +48,7 @@ pub fn get_unsealed_range<T: Into<PathBuf> + AsRef<Path>>(
     ticket: Ticket,
     offset: UnpaddedByteIndex,
     num_bytes: UnpaddedBytesAmount,
-) -> error::Result<UnpaddedBytesAmount> {
+) -> Result<UnpaddedBytesAmount> {
     let comm_d =
         as_safe_commitment::<<DefaultPieceHasher as Hasher>::Domain, _>(&comm_d, "comm_d")?;
 
@@ -95,7 +95,7 @@ pub fn get_unsealed_range<T: Into<PathBuf> + AsRef<Path>>(
 pub fn generate_piece_commitment<T: std::io::Read>(
     source: T,
     piece_size: UnpaddedBytesAmount,
-) -> error::Result<PieceInfo> {
+) -> Result<PieceInfo> {
     ensure_piece_size(piece_size)?;
 
     let mut temp_piece_file = tempfile()?;
@@ -148,7 +148,7 @@ pub fn add_piece<R, W>(
     target: W,
     piece_size: UnpaddedBytesAmount,
     piece_lengths: &[UnpaddedBytesAmount],
-) -> error::Result<(UnpaddedBytesAmount, Commitment)>
+) -> Result<(UnpaddedBytesAmount, Commitment)>
 where
     R: Read,
     W: Read + Write + Seek,
@@ -233,7 +233,7 @@ where
     }
 }
 
-fn ensure_piece_size(piece_size: UnpaddedBytesAmount) -> error::Result<()> {
+fn ensure_piece_size(piece_size: UnpaddedBytesAmount) -> Result<()> {
     ensure!(
         piece_size >= UnpaddedBytesAmount(MINIMUM_PIECE_SIZE),
         "Piece must be at least {} bytes",
@@ -262,7 +262,7 @@ pub fn write_and_preprocess<R, W>(
     source: R,
     target: W,
     piece_size: UnpaddedBytesAmount,
-) -> error::Result<(UnpaddedBytesAmount, Commitment)>
+) -> Result<(UnpaddedBytesAmount, Commitment)>
 where
     R: Read,
     W: Read + Write + Seek,
@@ -407,7 +407,7 @@ mod tests {
 
     #[test]
     #[ignore]
-    fn test_seal_lifecycle() -> Result<(), failure::Error> {
+    fn test_seal_lifecycle() -> Result<()> {
         pretty_env_logger::try_init().ok();
 
         let rng = &mut XorShiftRng::from_seed(crate::TEST_SEED);