chore(cli): remove Cmd trait (foundry-rs#5614)

Author: DaniPopes

crates/cli/src/cast/cmd/access_list.rs

@@ -4,7 +4,7 @@ use ethers::{
     providers::Middleware,
     types::{BlockId, NameOrAddress},
 };
-use eyre::WrapErr;
+use eyre::{Result, WrapErr};
 use foundry_cli::{
     opts::{EthereumOpts, TransactionOpts},
     utils,
@@ -57,7 +57,7 @@ pub struct AccessListArgs {
 }
 
 impl AccessListArgs {
-    pub async fn run(self) -> eyre::Result<()> {
+    pub async fn run(self) -> Result<()> {
         let AccessListArgs { to, sig, args, data, tx, eth, block, json: to_json } = self;
 
         let config = Config::from(&eth);
@@ -82,7 +82,7 @@ async fn access_list<M: Middleware, F: Into<NameOrAddress>, T: Into<NameOrAddres
     chain: Chain,
     block: Option<BlockId>,
     to_json: bool,
-) -> eyre::Result<()>
+) -> Result<()>
 where
     M::Error: 'static,
 {

crates/cli/src/cast/cmd/call.rs

@@ -4,7 +4,7 @@ use ethers::{
     solc::EvmVersion,
     types::{BlockId, NameOrAddress, U256},
 };
-use eyre::WrapErr;
+use eyre::{Result, WrapErr};
 use forge::executor::opts::EvmOpts;
 use foundry_cli::{
     opts::{EthereumOpts, TransactionOpts},
@@ -108,7 +108,7 @@ pub enum CallSubcommands {
 }
 
 impl CallArgs {
-    pub async fn run(self) -> eyre::Result<()> {
+    pub async fn run(self) -> Result<()> {
         let CallArgs {
             to,
             sig,
@@ -224,7 +224,7 @@ async fn fill_create(
     code: String,
     sig: Option<String>,
     args: Vec<String>,
-) -> eyre::Result<()> {
+) -> Result<()> {
     builder.value(value);
 
     let mut data = hex::decode(code.strip_prefix("0x").unwrap_or(&code))?;
@@ -246,7 +246,7 @@ async fn fill_tx(
     sig: Option<String>,
     args: Vec<String>,
     data: Option<String>,
-) -> eyre::Result<()> {
+) -> Result<()> {
     builder.value(value);
 
     if let Some(sig) = sig {

crates/cli/src/cast/cmd/create2.rs

@@ -6,7 +6,6 @@ use ethers::{
     utils::{get_create2_address_from_hash, keccak256},
 };
 use eyre::{Result, WrapErr};
-use foundry_cli::utils::Cmd;
 use rayon::prelude::*;
 use regex::RegexSetBuilder;
 use std::{str::FromStr, time::Instant};
@@ -59,16 +58,8 @@ pub struct Create2Output {
     pub salt: U256,
 }
 
-impl Cmd for Create2Args {
-    type Output = Create2Output;
-
-    fn run(self) -> eyre::Result<Self::Output> {
-        Create2Args::generate_address(self)
-    }
-}
-
 impl Create2Args {
-    fn generate_address(self) -> Result<Create2Output> {
+    pub fn run(self) -> Result<Create2Output> {
         let Create2Args {
             starts_with,
             ends_with,

crates/cli/src/cast/cmd/interface.rs

@@ -1,5 +1,6 @@
 use cast::{AbiPath, SimpleCast};
 use clap::Parser;
+use eyre::Result;
 use foundry_cli::opts::EtherscanOpts;
 use foundry_common::fs;
 use foundry_config::Config;
@@ -37,7 +38,7 @@ pub struct InterfaceArgs {
 }
 
 impl InterfaceArgs {
-    pub async fn run(self) -> eyre::Result<()> {
+    pub async fn run(self) -> Result<()> {
         let InterfaceArgs { path_or_address, name, pragma, output: output_location, etherscan } =
             self;
         let config = Config::from(&etherscan);

crates/cli/src/cast/cmd/logs.rs

@@ -5,13 +5,11 @@ use ethers::{
     providers::Middleware,
     types::{BlockId, BlockNumber, Filter, FilterBlockOption, NameOrAddress, ValueOrArray, H256},
 };
+use eyre::Result;
 use foundry_cli::{opts::EthereumOpts, utils};
-
 use foundry_common::abi::{get_event, parse_tokens};
 use foundry_config::Config;
-
 use itertools::Itertools;
-
 use std::str::FromStr;
 
 /// CLI arguments for `cast logs`.
@@ -55,7 +53,7 @@ pub struct LogsArgs {
 }
 
 impl LogsArgs {
-    pub async fn run(self) -> eyre::Result<()> {
+    pub async fn run(self) -> Result<()> {
         let LogsArgs {
             from_block, to_block, address, topics_or_args, sig_or_topic, json, eth, ..
         } = self;

crates/cli/src/cast/cmd/run.rs

@@ -1,6 +1,6 @@
 use clap::Parser;
 use ethers::{prelude::Middleware, solc::EvmVersion, types::H160};
-use eyre::WrapErr;
+use eyre::{Result, WrapErr};
 use forge::{
     executor::{inspector::cheatcodes::util::configure_tx_env, opts::EvmOpts},
     revm::primitives::U256 as rU256,
@@ -82,7 +82,7 @@ impl RunArgs {
     /// This replays the entire block the transaction was mined in unless `quick` is set to true
     ///
     /// Note: This executes the transaction(s) as is: Cheatcodes are disabled
-    pub async fn run(self) -> eyre::Result<()> {
+    pub async fn run(self) -> Result<()> {
         let figment =
             Config::figment_with_root(find_project_root_path(None).unwrap()).merge(self.rpc);
         let evm_opts = figment.extract::<EvmOpts>()?;

crates/cli/src/cast/cmd/send.rs

@@ -3,6 +3,7 @@ use clap::Parser;
 use ethers::{
     prelude::MiddlewareBuilder, providers::Middleware, signers::Signer, types::NameOrAddress,
 };
+use eyre::Result;
 use foundry_cli::{
     opts::{EthereumOpts, TransactionOpts},
     utils,
@@ -73,7 +74,7 @@ pub enum SendTxSubcommands {
 }
 
 impl SendTxArgs {
-    pub async fn run(self) -> eyre::Result<()> {
+    pub async fn run(self) -> Result<()> {
         let SendTxArgs {
             eth,
             to,
@@ -208,7 +209,7 @@ async fn cast_send<M: Middleware, F: Into<NameOrAddress>, T: Into<NameOrAddress>
     cast_async: bool,
     confs: usize,
     to_json: bool,
-) -> eyre::Result<()>
+) -> Result<()>
 where
     M::Error: 'static,
 {

crates/cli/src/cast/cmd/wallet/mod.rs

@@ -5,11 +5,8 @@ use ethers::{
     signers::{LocalWallet, Signer},
     types::{transaction::eip712::TypedData, Address, Signature},
 };
-use eyre::Context;
-use foundry_cli::{
-    opts::{RawWallet, Wallet},
-    utils::Cmd,
-};
+use eyre::{Context, Result};
+use foundry_cli::opts::{RawWallet, Wallet};
 use foundry_common::fs;
 use foundry_config::Config;
 use std::path::Path;
@@ -120,7 +117,7 @@ pub enum WalletSubcommands {
 }
 
 impl WalletSubcommands {
-    pub async fn run(self) -> eyre::Result<()> {
+    pub async fn run(self) -> Result<()> {
         match self {
             WalletSubcommands::New { path, unsafe_password, .. } => {
                 let mut rng = thread_rng();
@@ -281,7 +278,7 @@ flag to set your key via:
         Ok(())
     }
 
-    fn hex_str_to_bytes(s: &str) -> eyre::Result<Vec<u8>> {
+    fn hex_str_to_bytes(s: &str) -> Result<Vec<u8>> {
         Ok(match s.strip_prefix("0x") {
             Some(data) => hex::decode(data).wrap_err("Could not decode 0x-prefixed string.")?,
             None => s.as_bytes().to_vec(),

crates/cli/src/cast/cmd/wallet/vanity.rs

@@ -6,7 +6,8 @@ use ethers::{
     types::{H160, U256},
     utils::{get_contract_address, secret_key_to_address},
 };
-use foundry_cli::utils::Cmd;
+use eyre::Result;
+
 use rayon::iter::{self, ParallelIterator};
 use regex::Regex;
 use std::time::Instant;
@@ -37,10 +38,8 @@ pub struct VanityArgs {
     pub nonce: Option<u64>,
 }
 
-impl Cmd for VanityArgs {
-    type Output = LocalWallet;
-
-    fn run(self) -> eyre::Result<Self::Output> {
+impl VanityArgs {
+    pub fn run(self) -> Result<LocalWallet> {
         let Self { starts_with, ends_with, nonce } = self;
         let mut left_exact_hex = None;
         let mut left_regex = None;

crates/cli/src/cast/main.rs

@@ -7,7 +7,8 @@ use ethers::{
     types::Address,
     utils::keccak256,
 };
-use foundry_cli::{handler, prompt, stdin, utils, utils::Cmd};
+use eyre::Result;
+use foundry_cli::{handler, prompt, stdin, utils};
 use foundry_common::{
     abi::{format_tokens, get_event},
     fs,
@@ -25,7 +26,7 @@ pub mod opts;
 use opts::{Opts, Subcommands, ToBaseArgs};
 
 #[tokio::main]
-async fn main() -> eyre::Result<()> {
+async fn main() -> Result<()> {
     utils::load_dotenv();
     handler::install()?;
     utils::subscriber();