Improve storage monitor API

paritytech · Jan 10, 2024 · d2d5146 · d2d5146
1 parent 01ea45c
commit d2d5146
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
@@ -258,7 +258,7 @@ where
 
 		sc_storage_monitor::StorageMonitorService::try_spawn(
 			cli.storage_monitor,
-			database_source,
+			database_source.path(),
 			&task_manager.spawn_essential_handle(),
 		)?;
 

diff --git a/substrate/bin/node/cli/src/service.rs b/substrate/bin/node/cli/src/service.rs
@@ -775,7 +775,7 @@ pub fn new_full(config: Configuration, cli: Cli) -> Result<TaskManager, ServiceE
 
 	sc_storage_monitor::StorageMonitorService::try_spawn(
 		cli.storage_monitor,
-		database_source,
+		database_source.path(),
 		&task_manager.spawn_essential_handle(),
 	)
 	.map_err(|e| ServiceError::Application(e.into()))?;

diff --git a/substrate/client/storage-monitor/Cargo.toml b/substrate/client/storage-monitor/Cargo.toml
@@ -15,7 +15,6 @@ workspace = true
 clap = { version = "4.4.14", features = ["derive", "string"] }
 log = "0.4.17"
 fs4 = "0.7.0"
-sc-client-db = { path = "../db", default-features = false }
 sp-core = { path = "../../primitives/core" }
 tokio = "1.22.0"
 thiserror = "1.0.48"
diff --git a/substrate/client/storage-monitor/src/lib.rs b/substrate/client/storage-monitor/src/lib.rs
@@ -17,7 +17,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use clap::Args;
-use sc_client_db::DatabaseSource;
 use sp_core::traits::SpawnEssentialNamed;
 use std::{
 	io,
@@ -70,10 +69,10 @@ impl StorageMonitorService {
 	/// Creates new StorageMonitorService for given client config
 	pub fn try_spawn(
 		parameters: StorageMonitorParams,
-		database: DatabaseSource,
+		path: Option<&Path>,
 		spawner: &impl SpawnEssentialNamed,
 	) -> Result<()> {
-		Ok(match (parameters.threshold, database.path()) {
+		Ok(match (parameters.threshold, path) {
 			(0, _) => {
 				log::info!(
 					target: LOG_TARGET,
@@ -89,10 +88,11 @@ impl StorageMonitorService {
 			(threshold, Some(path)) => {
 				log::debug!(
 					target: LOG_TARGET,
-					"Initializing StorageMonitorService for db path: {path:?}",
+					"Initializing StorageMonitorService for db path: {}",
+					path.display()
 				);
 
-				Self::check_free_space(&path, threshold)?;
+				Self::check_free_space(path, threshold)?;
 
 				let storage_monitor_service = StorageMonitorService {
 					path: path.to_path_buf(),