From 3cd8fb574804225fd7f9897784fa0681c1b68b75 Mon Sep 17 00:00:00 2001 From: Martin Paulucci <1040971+mpaulucci@users.noreply.github.com> Date: Mon, 16 Jan 2023 13:40:49 -0300 Subject: [PATCH] refactor: remove db file on db drop command. (#885) Co-authored-by: lambdaclass-user Co-authored-by: Bjerg --- bin/reth/src/db/mod.rs | 42 +++++------------------------------------- 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/bin/reth/src/db/mod.rs b/bin/reth/src/db/mod.rs index 95650fd809..b79e8ddf53 100644 --- a/bin/reth/src/db/mod.rs +++ b/bin/reth/src/db/mod.rs @@ -7,7 +7,7 @@ use reth_db::{ database::Database, table::Table, tables, - transaction::{DbTx, DbTxMut}, + transaction::DbTx, }; use reth_interfaces::test_utils::generators::random_block_range; use reth_provider::insert_canonical_block; @@ -115,7 +115,7 @@ impl Command { tool.list(args)?; } Subcommands::Drop => { - tool.drop()?; + tool.drop(&self.db)?; } } @@ -203,41 +203,9 @@ impl<'a, DB: Database> DbTool<'a, DB> { Ok(()) } - fn drop(&mut self) -> Result<()> { - macro_rules! drop_tables { - ([$($table:ident,)*]) => { - let _tx = self.db.tx_mut()?; - $(_tx.clear::()?;)* - _tx.commit()?; - }; - } - - drop_tables!([ - CanonicalHeaders, - HeaderTD, - HeaderNumbers, - Headers, - BlockBodies, - BlockOmmers, - NonCanonicalTransactions, - Transactions, - TxHashNumber, - Receipts, - Logs, - PlainAccountState, - PlainStorageState, - Bytecodes, - BlockTransitionIndex, - TxTransitionIndex, - AccountHistory, - StorageHistory, - AccountChangeSet, - StorageChangeSet, - TxSenders, - Config, - SyncStage, - ]); - + fn drop(&mut self, path: &PlatformPath) -> Result<()> { + info!(target: "reth::cli", "Dropping db at {}", path); + std::fs::remove_dir_all(path).wrap_err("Dropping the database failed")?; Ok(()) } }