cleanup: configuration + service builder

bin/node/cli/benches/block_production.rs

@@ -113,7 +113,6 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		base_path: Some(base_path),
 		informant_output_format: Default::default(),
 		wasm_runtime_overrides: None,
-		available_storage_threshold: 1000,
 	};
 
 	node_cli::service::new_full_base(config, false, |_, _| ())

bin/node/cli/benches/transaction_pool.rs

@@ -106,7 +106,6 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 		base_path: Some(base_path),
 		informant_output_format: Default::default(),
 		wasm_runtime_overrides: None,
-		available_storage_threshold: 1000,
 	};
 
 	node_cli::service::new_full_base(config, false, |_, _| ()).expect("Creates node")

client/cli/src/config.rs

@@ -191,16 +191,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			.unwrap_or_else(|| Ok((None, KeystoreConfig::InMemory)))
 	}
 
-	/// Get the database available storage space threshold.
-	///
-	/// By default this is retrieved from `DatabaseParams` if it is available.
-	fn database_storage_threshold(&self) -> Result<u64> {
-		Ok(self
-			.database_params()
-			.map(|x| x.database_storage_threshold())
-			.unwrap_or_default())
-	}
-
 	/// Get the database cache size.
 	///
 	/// By default this is retrieved from `DatabaseParams` if it is available. Otherwise its `None`.
@@ -572,7 +562,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			base_path: Some(base_path),
 			informant_output_format: Default::default(),
 			runtime_cache_size,
-			available_storage_threshold: self.database_storage_threshold()?,
 		})
 	}
 

client/cli/src/params/database_params.rs

@@ -29,12 +29,6 @@ pub struct DatabaseParams {
 	/// Limit the memory the database cache can use.
 	#[arg(long = "db-cache", value_name = "MiB")]
 	pub database_cache_size: Option<usize>,
-
-	/// Required available space on database storage. If available space for DB storage drops below
-	/// the given threshold, node will be gracefully terminated. If `0` is given monitoring will be
-	/// disabled.
-	#[arg(long = "db-storage-threshold", value_name = "MB", default_value_t = 1000)]
-	pub database_storage_threshold: u64,
 }
 
 impl DatabaseParams {
@@ -47,9 +41,4 @@ impl DatabaseParams {
 	pub fn database_cache_size(&self) -> Option<usize> {
 		self.database_cache_size
 	}
-
-	/// Available storage space threshold
-	pub fn database_storage_threshold(&self) -> u64 {
-		self.database_storage_threshold
-	}
 }

client/cli/src/runner.rs

@@ -367,7 +367,6 @@ mod tests {
 				base_path: None,
 				informant_output_format: Default::default(),
 				runtime_cache_size: 2,
-				available_storage_threshold: 1000,
 			},
 			runtime,
 		)

client/service/Cargo.toml

@@ -80,8 +80,6 @@ tokio = { version = "1.22.0", features = ["time", "rt-multi-thread", "parking_lo
 tempfile = "3.1.0"
 directories = "4.0.1"
 static_init = "1.0.3"
-nix = { version = "0.26.1", features = ["fs"] }
-notify = "5.0.0"
 
 [dev-dependencies]
 substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/runtime/client" }

client/service/src/builder.rs

@@ -23,7 +23,6 @@ use crate::{
 	error::Error,
 	metrics::MetricsService,
 	start_rpc_servers,
-	storage_monitor::StorageMonitorService,
 	BuildGenesisBlock, GenesisBlockBuilder, RpcHandlers, SpawnTaskHandle, TaskManager,
 	TransactionPoolAdapter,
 };
@@ -536,14 +535,6 @@ where
 		metrics_service.run(client.clone(), transaction_pool.clone(), network.clone()),
 	);
 
-	if let Some(storage_monitor_service) = StorageMonitorService::new_for_config(&config)? {
-		task_manager.spawn_essential_handle().spawn(
-			"storage-monitor",
-			None,
-			storage_monitor_service.run(),
-		)
-	}
-
 	let rpc_id_provider = config.rpc_id_provider.take();
 
 	// jsonrpsee RPC

client/service/src/config.rs

@@ -149,9 +149,6 @@ pub struct Configuration {
 	pub informant_output_format: sc_informant::OutputFormat,
 	/// Maximum number of different runtime versions that can be cached.
 	pub runtime_cache_size: u8,
-	/// Threshold (in megabytes) for available storage space associated with `base_path`. `0` means
-	/// no storage monitoring.
-	pub available_storage_threshold: u64,
 }
 
 /// Type for tasks spawned by the executor.

client/service/src/lib.rs

@@ -32,7 +32,6 @@ pub mod client;
 #[cfg(not(feature = "test-helpers"))]
 mod client;
 mod metrics;
-mod storage_monitor;
 mod task_manager;
 
 use std::{collections::HashMap, net::SocketAddr};

client/service/test/src/lib.rs

@@ -265,7 +265,6 @@ fn node_config<
 		base_path: Some(BasePath::new(root)),
 		informant_output_format: Default::default(),
 		runtime_cache_size: 2,
-		available_storage_threshold: 1000,
 	}
 }