chore: Remove reth recover storage-tries sub-command (paradigmxyz#18580)

Author: mediocregopher

crates/cli/commands/src/lib.rs

@@ -24,7 +24,6 @@ pub mod node;
 pub mod p2p;
 pub mod prune;
 pub mod re_execute;
-pub mod recover;
 pub mod stage;
 #[cfg(feature = "arbitrary")]
 pub mod test_vectors;

crates/cli/commands/src/recover/mod.rs

@@ -165,9 +165,6 @@ where
         }
         Commands::P2P(command) => runner.run_until_ctrl_c(command.execute::<N>()),
         Commands::Config(command) => runner.run_until_ctrl_c(command.execute()),
-        Commands::Recover(command) => {
-            runner.run_command_until_exit(|ctx| command.execute::<N>(ctx))
-        }
         Commands::Prune(command) => runner.run_until_ctrl_c(command.execute::<N>()),
         #[cfg(feature = "dev")]
         Commands::TestVectors(command) => runner.run_until_ctrl_c(command.execute()),

crates/cli/commands/src/recover/storage_tries.rs

@@ -12,7 +12,7 @@ use reth_cli_commands::{
     config_cmd, db, download, dump_genesis, export_era, import, import_era, init_cmd, init_state,
     launcher::FnLauncher,
     node::{self, NoArgs},
-    p2p, prune, re_execute, recover, stage,
+    p2p, prune, re_execute, stage,
 };
 use reth_cli_runner::CliRunner;
 use reth_db::DatabaseEnv;
@@ -260,9 +260,6 @@ pub enum Commands<C: ChainSpecParser, Ext: clap::Args + fmt::Debug> {
     /// Write config to stdout
     #[command(name = "config")]
     Config(config_cmd::Command),
-    /// Scripts for node recovery
-    #[command(name = "recover")]
-    Recover(recover::Command<C>),
     /// Prune according to the configuration without any limits
     #[command(name = "prune")]
     Prune(prune::PruneCommand<C>),
@@ -289,7 +286,6 @@ impl<C: ChainSpecParser, Ext: clap::Args + fmt::Debug> Commands<C, Ext> {
             #[cfg(feature = "dev")]
             Self::TestVectors(_) => None,
             Self::Config(_) => None,
-            Self::Recover(cmd) => cmd.chain_spec(),
             Self::Prune(cmd) => cmd.chain_spec(),
             Self::ReExecute(cmd) => cmd.chain_spec(),
         }

crates/ethereum/cli/src/app.rs

@@ -102,9 +102,6 @@ where
             }
             Commands::P2P(command) => runner.run_until_ctrl_c(command.execute::<OpNode>()),
             Commands::Config(command) => runner.run_until_ctrl_c(command.execute()),
-            Commands::Recover(command) => {
-                runner.run_command_until_exit(|ctx| command.execute::<OpNode>(ctx))
-            }
             Commands::Prune(command) => runner.run_until_ctrl_c(command.execute::<OpNode>()),
             #[cfg(feature = "dev")]
             Commands::TestVectors(command) => runner.run_until_ctrl_c(command.execute()),

crates/ethereum/cli/src/interface.rs

@@ -7,7 +7,7 @@ use reth_cli::chainspec::ChainSpecParser;
 use reth_cli_commands::{
     config_cmd, db, dump_genesis, init_cmd,
     node::{self, NoArgs},
-    p2p, prune, re_execute, recover, stage,
+    p2p, prune, re_execute, stage,
 };
 use std::{fmt, sync::Arc};
 
@@ -51,9 +51,6 @@ pub enum Commands<Spec: ChainSpecParser = OpChainSpecParser, Ext: clap::Args + f
     /// Write config to stdout
     #[command(name = "config")]
     Config(config_cmd::Command),
-    /// Scripts for node recovery
-    #[command(name = "recover")]
-    Recover(recover::Command<Spec>),
     /// Prune according to the configuration without any limits
     #[command(name = "prune")]
     Prune(prune::PruneCommand<Spec>),
@@ -82,7 +79,6 @@ impl<
             Self::Stage(cmd) => cmd.chain_spec(),
             Self::P2P(cmd) => cmd.chain_spec(),
             Self::Config(_) => None,
-            Self::Recover(cmd) => cmd.chain_spec(),
             Self::Prune(cmd) => cmd.chain_spec(),
             Self::ImportOp(cmd) => cmd.chain_spec(),
             Self::ImportReceiptsOp(cmd) => cmd.chain_spec(),

crates/optimism/cli/src/app.rs

@@ -40,7 +40,5 @@
         - [`reth p2p rlpx ping`](/cli/reth/p2p/rlpx/ping)
       - [`reth p2p bootnode`](/cli/reth/p2p/bootnode)
     - [`reth config`](/cli/reth/config)
-    - [`reth recover`](/cli/reth/recover)
-      - [`reth recover storage-tries`](/cli/reth/recover/storage-tries)
     - [`reth prune`](/cli/reth/prune)
     - [`reth re-execute`](/cli/reth/re-execute)

crates/optimism/cli/src/commands/mod.rs

@@ -21,7 +21,6 @@ Commands:
   stage         Manipulate individual stages
   p2p           P2P Debugging utilities
   config        Write config to stdout
-  recover       Scripts for node recovery
   prune         Prune according to the configuration without any limits
   re-execute    Re-execute blocks in parallel to verify historical sync correctness
   help          Print this message or the help of the given subcommand(s)