Revert "Deprecate "paritydb-experimental" CLI in favour or "paritydb" (…

…paritytech#10975)"

This reverts commit e463356.

client/cli/src/arg_enums.rs

@@ -209,10 +209,8 @@ pub enum Database {
 	/// ParityDb. <https://github.com/paritytech/parity-db/>
 	ParityDb,
 	/// Detect whether there is an existing database. Use it, if there is, if not, create new
-	/// instance of ParityDb
+	/// instance of paritydb
 	Auto,
-	/// ParityDb. <https://github.com/paritytech/parity-db/>
-	ParityDbDeprecated,
 }
 
 impl std::str::FromStr for Database {
@@ -222,8 +220,6 @@ impl std::str::FromStr for Database {
 		if s.eq_ignore_ascii_case("rocksdb") {
 			Ok(Self::RocksDb)
 		} else if s.eq_ignore_ascii_case("paritydb-experimental") {
-			Ok(Self::ParityDbDeprecated)
-		} else if s.eq_ignore_ascii_case("paritydb") {
 			Ok(Self::ParityDb)
 		} else if s.eq_ignore_ascii_case("auto") {
 			Ok(Self::Auto)
@@ -236,7 +232,7 @@ impl std::str::FromStr for Database {
 impl Database {
 	/// Returns all the variants of this enum to be shown in the cli.
 	pub fn variants() -> &'static [&'static str] {
-		&["rocksdb", "paritydb", "paritydb-experimental", "auto"]
+		&["rocksdb", "paritydb-experimental", "auto"]
 	}
 }
 

client/cli/src/config.rs

@@ -222,13 +222,6 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		Ok(match database {
 			Database::RocksDb => DatabaseSource::RocksDb { path: rocksdb_path, cache_size },
 			Database::ParityDb => DatabaseSource::ParityDb { path: paritydb_path },
-			Database::ParityDbDeprecated => {
-				eprintln!(
-					"WARNING: \"paritydb-experimental\" database setting is deprecated and will be removed in future releases. \
-				Please update your setup to use the new value: \"paritydb\"."
-				);
-				DatabaseSource::ParityDb { path: paritydb_path }
-			},
 			Database::Auto => DatabaseSource::Auto { paritydb_path, rocksdb_path, cache_size },
 		})
 	}