From 99230afd3278388da24532ab45d25010e1c49412 Mon Sep 17 00:00:00 2001 From: James Prestwich <10149425+prestwich@users.noreply.github.com> Date: Thu, 3 Feb 2022 12:36:05 -0800 Subject: [PATCH] dep: replace anyhow with eyre in examples (#859) --- Cargo.lock | 2 +- Cargo.toml | 2 +- examples/abigen.rs | 2 +- examples/contract_human_readable.rs | 2 +- examples/contract_with_abi.rs | 2 +- examples/ens.rs | 4 ++-- examples/ipc.rs | 2 +- examples/local_signer.rs | 5 ++--- examples/mnemonic.rs | 2 +- examples/moonbeam_with_abi.rs | 2 +- examples/quorum.rs | 2 +- examples/sign.rs | 4 ++-- examples/transfer_eth.rs | 2 +- examples/uniswapv2.rs | 2 +- examples/watch_blocks.rs | 2 +- 15 files changed, 18 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae46565a..349db13c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1125,7 +1125,6 @@ dependencies = [ name = "ethers" version = "0.6.0" dependencies = [ - "anyhow", "bytes", "ethers-addressbook", "ethers-contract", @@ -1135,6 +1134,7 @@ dependencies = [ "ethers-providers", "ethers-signers", "ethers-solc", + "eyre", "hex", "rand 0.8.4", "serde", diff --git a/Cargo.toml b/Cargo.toml index 0d16a9f3..852e86c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,7 +97,7 @@ ethers-providers = { version = "^0.6.0", default-features = false, path = "./eth [target.'cfg(target_family = "unix")'.dev-dependencies] ethers-providers = { version = "^0.6.0", default-features = false, path = "./ethers-providers", features = ["ws", "ipc"] } -anyhow = "1.0.39" +eyre = "0.6.6" rand = "0.8.4" serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0.64" diff --git a/examples/abigen.rs b/examples/abigen.rs index e3c8bc1a..5880d115 100644 --- a/examples/abigen.rs +++ b/examples/abigen.rs @@ -1,6 +1,6 @@ use ethers::{contract::Abigen, solc::Solc}; -fn main() -> anyhow::Result<()> { +fn main() -> eyre::Result<()> { let mut args = std::env::args(); args.next().unwrap(); // skip program name diff --git a/examples/contract_human_readable.rs b/examples/contract_human_readable.rs index 41b98288..674c2e66 100644 --- a/examples/contract_human_readable.rs +++ b/examples/contract_human_readable.rs @@ -1,9 +1,9 @@ -use anyhow::Result; use ethers::{ prelude::*, solc::{Project, ProjectPathsConfig}, utils::Ganache, }; +use eyre::Result; use std::{convert::TryFrom, path::PathBuf, sync::Arc, time::Duration}; // Generate the type-safe contract bindings by providing the ABI diff --git a/examples/contract_with_abi.rs b/examples/contract_with_abi.rs index 83af2d9f..c151649e 100644 --- a/examples/contract_with_abi.rs +++ b/examples/contract_with_abi.rs @@ -1,5 +1,5 @@ -use anyhow::Result; use ethers::{prelude::*, utils::Ganache}; +use eyre::Result; use std::{convert::TryFrom, path::Path, sync::Arc, time::Duration}; // Generate the type-safe contract bindings by providing the ABI diff --git a/examples/ens.rs b/examples/ens.rs index 4afbe4d5..894c466e 100644 --- a/examples/ens.rs +++ b/examples/ens.rs @@ -1,5 +1,5 @@ -use anyhow::Result; use ethers::{prelude::*, utils::Ganache}; +use eyre::Result; use std::convert::TryFrom; #[tokio::main] @@ -20,7 +20,7 @@ async fn main() -> Result<()> { .send_transaction(tx, None) .await? .await? - .ok_or_else(|| anyhow::format_err!("tx dropped from mempool"))?; + .ok_or_else(|| eyre::format_err!("tx dropped from mempool"))?; let tx = provider.get_transaction(receipt.transaction_hash).await?; println!("{}", serde_json::to_string(&tx)?); diff --git a/examples/ipc.rs b/examples/ipc.rs index 9f747635..a4c9e4d7 100644 --- a/examples/ipc.rs +++ b/examples/ipc.rs @@ -1,6 +1,6 @@ #[tokio::main] #[cfg(feature = "ipc")] -async fn main() -> anyhow::Result<()> { +async fn main() -> eyre::Result<()> { use ethers::prelude::*; let provider = Provider::connect_ipc("~/.ethereum/geth.ipc") diff --git a/examples/local_signer.rs b/examples/local_signer.rs index d8eb415b..3ddcda82 100644 --- a/examples/local_signer.rs +++ b/examples/local_signer.rs @@ -1,5 +1,5 @@ -use anyhow::Result; use ethers::{prelude::*, utils::Ganache}; +use eyre::Result; use std::convert::TryFrom; #[tokio::main] @@ -22,8 +22,7 @@ async fn main() -> Result<()> { let pending_tx = client.send_transaction(tx, None).await?; // get the mined tx - let receipt = - pending_tx.await?.ok_or_else(|| anyhow::format_err!("tx dropped from mempool"))?; + let receipt = pending_tx.await?.ok_or_else(|| eyre::format_err!("tx dropped from mempool"))?; let tx = client.get_transaction(receipt.transaction_hash).await?; println!("Sent tx: {}\n", serde_json::to_string(&tx)?); diff --git a/examples/mnemonic.rs b/examples/mnemonic.rs index 0685a165..2c14b69d 100644 --- a/examples/mnemonic.rs +++ b/examples/mnemonic.rs @@ -1,6 +1,6 @@ use ethers::signers::{coins_bip39::English, MnemonicBuilder}; -fn main() -> anyhow::Result<()> { +fn main() -> eyre::Result<()> { let phrase = "work man father plunge mystery proud hollow address reunion sauce theory bonus"; let index = 0u32; let password = "TREZOR123"; diff --git a/examples/moonbeam_with_abi.rs b/examples/moonbeam_with_abi.rs index c455d5f3..266c56c9 100644 --- a/examples/moonbeam_with_abi.rs +++ b/examples/moonbeam_with_abi.rs @@ -1,5 +1,5 @@ -use anyhow::Result; use ethers::prelude::*; +use eyre::Result; use std::{convert::TryFrom, path::Path, sync::Arc, time::Duration}; abigen!( diff --git a/examples/quorum.rs b/examples/quorum.rs index a4581ecc..63cd59bd 100644 --- a/examples/quorum.rs +++ b/examples/quorum.rs @@ -5,7 +5,7 @@ use ethers::{prelude::*, utils::Ganache}; use std::{str::FromStr, time::Duration}; #[tokio::main] -async fn main() -> anyhow::Result<()> { +async fn main() -> eyre::Result<()> { let ganache = Ganache::new().spawn(); // create a quorum provider with some providers diff --git a/examples/sign.rs b/examples/sign.rs index a385b048..a3c2d79d 100644 --- a/examples/sign.rs +++ b/examples/sign.rs @@ -1,5 +1,5 @@ -// use the anyhow crate for easy idiomatic error handling -use anyhow::Result; +// use the eyre crate for easy idiomatic error handling +use eyre::Result; // use the ethers_core rand for rng use ethers_core::rand::thread_rng; // use the ethers_signers crate to manage LocalWallet and Signer diff --git a/examples/transfer_eth.rs b/examples/transfer_eth.rs index c0680c71..9aa249d3 100644 --- a/examples/transfer_eth.rs +++ b/examples/transfer_eth.rs @@ -1,5 +1,5 @@ -use anyhow::Result; use ethers::{prelude::*, utils::Ganache}; +use eyre::Result; use std::convert::TryFrom; #[tokio::main] diff --git a/examples/uniswapv2.rs b/examples/uniswapv2.rs index 91ae6b2b..c2c51655 100644 --- a/examples/uniswapv2.rs +++ b/examples/uniswapv2.rs @@ -1,5 +1,5 @@ -use anyhow::Result; use ethers::prelude::*; +use eyre::Result; use std::sync::Arc; // Generate the type-safe contract bindings by providing the ABI diff --git a/examples/watch_blocks.rs b/examples/watch_blocks.rs index 8ee2cffb..7e075857 100644 --- a/examples/watch_blocks.rs +++ b/examples/watch_blocks.rs @@ -2,7 +2,7 @@ use ethers::{prelude::*, utils::Ganache}; use std::time::Duration; #[tokio::main] -async fn main() -> anyhow::Result<()> { +async fn main() -> eyre::Result<()> { let ganache = Ganache::new().block_time(1u64).spawn(); let ws = Ws::connect(ganache.ws_endpoint()).await?; let provider = Provider::new(ws).interval(Duration::from_millis(2000));