diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index ab6644a379bb50e6d43eb7a963bd7b6a02ec91a9..8f18aec891e9b911edffd14cb8b4afae4adc54b1 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -153,7 +153,7 @@ cli = [
"sc-cli",
"frame-benchmarking-cli",
"substrate-frame-cli",
- "sc-service/db",
+ "sc-service/rocksdb",
"clap",
"clap_complete",
"substrate-build-script-utils",
diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml
index f7a78d10910b3e772b4d67e1e7ee67d2221dcf95..7caf10366b48c9f31618e5b1b9cc5c776e84df2a 100644
--- a/substrate/bin/node/testing/Cargo.toml
+++ b/substrate/bin/node/testing/Cargo.toml
@@ -22,21 +22,18 @@ frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
node-executor = { version = "3.0.0-dev", path = "../executor" }
node-primitives = { version = "2.0.0", path = "../primitives" }
node-runtime = { version = "3.0.0-dev", path = "../runtime" }
-pallet-asset-tx-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/asset-tx-payment/" }
+pallet-asset-tx-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/asset-tx-payment" }
pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
-sc-client-api = { version = "4.0.0-dev", path = "../../../client/api/" }
-sc-client-db = { version = "0.10.0-dev", features = [
- "kvdb-rocksdb",
- "parity-db",
-], path = "../../../client/db/" }
+sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
+sc-client-db = { version = "0.10.0-dev", features = ["rocksdb"], path = "../../../client/db" }
sc-consensus = { version = "0.10.0-dev", path = "../../../client/consensus/common" }
sc-executor = { version = "0.10.0-dev", features = [
"wasmtime",
], path = "../../../client/executor" }
sc-service = { version = "0.10.0-dev", features = [
"test-helpers",
- "db",
+ "rocksdb",
], path = "../../../client/service" }
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }
sp-block-builder = { version = "4.0.0-dev", path = "../../../primitives/block-builder" }
diff --git a/substrate/client/cli/Cargo.toml b/substrate/client/cli/Cargo.toml
index 456489e5f6639e4e3c0def056547f760657387c2..4f0d777d137b98d1affa0422c37797ab7e6d55a2 100644
--- a/substrate/client/cli/Cargo.toml
+++ b/substrate/client/cli/Cargo.toml
@@ -31,7 +31,7 @@ thiserror = "1.0.30"
tiny-bip39 = "0.8.2"
tokio = { version = "1.17.0", features = ["signal", "rt-multi-thread", "parking_lot"] }
sc-client-api = { version = "4.0.0-dev", path = "../api" }
-sc-client-db = { version = "0.10.0-dev", path = "../db" }
+sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../db" }
sc-keystore = { version = "4.0.0-dev", path = "../keystore" }
sc-network = { version = "0.10.0-dev", path = "../network" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../service" }
@@ -50,4 +50,6 @@ sp-version = { version = "5.0.0", path = "../../primitives/version" }
tempfile = "3.1.0"
[features]
+default = ["rocksdb"]
+rocksdb = ["sc-client-db/rocksdb"]
wasmtime = ["sc-service/wasmtime"]
diff --git a/substrate/client/cli/src/arg_enums.rs b/substrate/client/cli/src/arg_enums.rs
index bc0989cf346590d409fecac57ae82235b584682a..283fef985dfb9a67fd6e47667e1db47468c9fb51 100644
--- a/substrate/client/cli/src/arg_enums.rs
+++ b/substrate/client/cli/src/arg_enums.rs
@@ -238,6 +238,7 @@ impl Into<sc_service::config::RpcMethods> for RpcMethods {
#[derive(Debug, Clone, PartialEq, Copy)]
pub enum Database {
/// Facebooks RocksDB
+ #[cfg(feature = "rocksdb")]
RocksDb,
/// ParityDb. <https://github.com/paritytech/parity-db/>
ParityDb,
@@ -252,12 +253,14 @@ impl std::str::FromStr for Database {
type Err = String;
fn from_str(s: &str) -> Result<Self, String> {
+ #[cfg(feature = "rocksdb")]
if s.eq_ignore_ascii_case("rocksdb") {
- Ok(Self::RocksDb)
- } else if s.eq_ignore_ascii_case("paritydb-experimental") {
- Ok(Self::ParityDbDeprecated)
+ return Ok(Self::RocksDb)
+ }
+ if s.eq_ignore_ascii_case("paritydb-experimental") {
+ return Ok(Self::ParityDbDeprecated)
} else if s.eq_ignore_ascii_case("paritydb") {
- Ok(Self::ParityDb)
+ return Ok(Self::ParityDb)
} else if s.eq_ignore_ascii_case("auto") {
Ok(Self::Auto)
} else {
@@ -268,8 +271,14 @@ 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"]
+ pub const fn variants() -> &'static [&'static str] {
+ &[
+ #[cfg(feature = "rocksdb")]
+ "rocksdb",
+ "paritydb",
+ "paritydb-experimental",
+ "auto",
+ ]
}
}
diff --git a/substrate/client/cli/src/config.rs b/substrate/client/cli/src/config.rs
index 5e91cf6c74dae0aadaa7bed9033a011eca0a26ff..6e1317c11fbc4a2e65adfe4417e22dd19f062f22 100644
--- a/substrate/client/cli/src/config.rs
+++ b/substrate/client/cli/src/config.rs
@@ -220,6 +220,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
let rocksdb_path = base_path.join("db").join(role_dir);
let paritydb_path = base_path.join("paritydb").join(role_dir);
Ok(match database {
+ #[cfg(feature = "rocksdb")]
Database::RocksDb => DatabaseSource::RocksDb { path: rocksdb_path, cache_size },
Database::ParityDb => DatabaseSource::ParityDb { path: paritydb_path },
Database::ParityDbDeprecated => {
@@ -500,7 +501,16 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
let net_config_dir = config_dir.join(DEFAULT_NETWORK_CONFIG_PATH);
let client_id = C::client_id();
let database_cache_size = self.database_cache_size()?.unwrap_or(1024);
- let database = self.database()?.unwrap_or(Database::RocksDb);
+ let database = self.database()?.unwrap_or(
+ #[cfg(feature = "rocksdb")]
+ {
+ Database::RocksDb
+ },
+ #[cfg(not(feature = "rocksdb"))]
+ {
+ Database::ParityDb
+ },
+ );
let node_key = self.node_key(&net_config_dir)?;
let role = self.role(is_dev)?;
let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8);
diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml
index e1472bcbda01a0e67cd2057ae4d4e113ab6d7193..3b6402b3f6023bbae88d17678684fe8f02248305 100644
--- a/substrate/client/db/Cargo.toml
+++ b/substrate/client/db/Cargo.toml
@@ -22,7 +22,7 @@ kvdb-memorydb = "0.11.0"
kvdb-rocksdb = { version = "0.15.2", optional = true }
linked-hash-map = "0.5.4"
log = "0.4.17"
-parity-db = { version = "0.3.13", optional = true }
+parity-db = "0.3.13"
parking_lot = "0.12.0"
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sc-state-db = { version = "0.10.0-dev", path = "../state-db" }
@@ -45,5 +45,4 @@ substrate-test-runtime-client = { version = "2.0.0", path = "../../test-utils/ru
default = []
test-helpers = []
runtime-benchmarks = []
-with-kvdb-rocksdb = ["kvdb-rocksdb"]
-with-parity-db = ["parity-db"]
+rocksdb = ["kvdb-rocksdb"]
diff --git a/substrate/client/db/src/lib.rs b/substrate/client/db/src/lib.rs
index ccdb434dfbd320fa521578cd40b9fe8be01b07a4..f1adbd3df1a0f218ed0e3c5e41a367c5eae7c62b 100644
--- a/substrate/client/db/src/lib.rs
+++ b/substrate/client/db/src/lib.rs
@@ -30,15 +30,13 @@
pub mod offchain;
-#[cfg(any(feature = "with-kvdb-rocksdb", test))]
pub mod bench;
mod children;
-#[cfg(feature = "with-parity-db")]
mod parity_db;
mod stats;
mod storage_cache;
-#[cfg(any(feature = "with-kvdb-rocksdb", test))]
+#[cfg(any(feature = "rocksdb", test))]
mod upgrade;
mod utils;
@@ -94,7 +92,6 @@ use sp_trie::{prefixed_key, MemoryDB, PrefixedMemoryDB};
pub use sc_state_db::PruningMode;
pub use sp_database::Database;
-#[cfg(any(feature = "with-kvdb-rocksdb", test))]
pub use bench::BenchmarkingState;
const CACHE_HEADERS: usize = 8;
@@ -106,7 +103,6 @@ const DEFAULT_CHILD_RATIO: (usize, usize) = (1, 10);
pub type DbState<B> =
sp_state_machine::TrieBackend<Arc<dyn sp_state_machine::Storage<HashFor<B>>>, HashFor<B>>;
-#[cfg(feature = "with-parity-db")]
/// Length of a [`DbHash`].
const DB_HASH_LEN: usize = 32;
@@ -330,6 +326,7 @@ pub enum DatabaseSource {
cache_size: usize,
},
/// Load a RocksDB database from a given path. Recommended for most uses.
+ #[cfg(feature = "rocksdb")]
RocksDb {
/// Path to the database.
path: PathBuf,
@@ -362,7 +359,9 @@ impl DatabaseSource {
// IIUC this is needed for polkadot to create its own dbs, so until it can use parity db
// I would think rocksdb, but later parity-db.
DatabaseSource::Auto { paritydb_path, .. } => Some(paritydb_path),
- DatabaseSource::RocksDb { path, .. } | DatabaseSource::ParityDb { path } => Some(path),
+ #[cfg(feature = "rocksdb")]
+ DatabaseSource::RocksDb { path, .. } => Some(path),
+ DatabaseSource::ParityDb { path } => Some(path),
DatabaseSource::Custom { .. } => None,
}
}
@@ -374,7 +373,11 @@ impl DatabaseSource {
*paritydb_path = p.into();
true
},
- DatabaseSource::RocksDb { ref mut path, .. } |
+ #[cfg(feature = "rocksdb")]
+ DatabaseSource::RocksDb { ref mut path, .. } => {
+ *path = p.into();
+ true
+ },
DatabaseSource::ParityDb { ref mut path } => {
*path = p.into();
true
@@ -388,6 +391,7 @@ impl std::fmt::Display for DatabaseSource {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let name = match self {
DatabaseSource::Auto { .. } => "Auto",
+ #[cfg(feature = "rocksdb")]
DatabaseSource::RocksDb { .. } => "RocksDb",
DatabaseSource::ParityDb { .. } => "ParityDb",
DatabaseSource::Custom { .. } => "Custom",
diff --git a/substrate/client/db/src/utils.rs b/substrate/client/db/src/utils.rs
index 0227e4db8bcd058190690a6c71882c08746ed228..567950d089e1b1a078725d00f76c481f195e79c1 100644
--- a/substrate/client/db/src/utils.rs
+++ b/substrate/client/db/src/utils.rs
@@ -34,12 +34,6 @@ use sp_trie::DBValue;
/// Number of columns in the db. Must be the same for both full && light dbs.
/// Otherwise RocksDb will fail to open database && check its type.
-#[cfg(any(
- feature = "with-kvdb-rocksdb",
- feature = "with-parity-db",
- feature = "test-helpers",
- test
-))]
pub const NUM_COLUMNS: u32 = 13;
/// Meta column. The set of keys in the column is shared by full && light storages.
pub const COLUMN_META: u32 = 0;
@@ -198,6 +192,7 @@ fn open_database_at<Block: BlockT>(
) -> OpenDbResult {
let db: Arc<dyn Database<DbHash>> = match &db_source {
DatabaseSource::ParityDb { path } => open_parity_db::<Block>(path, db_type, create)?,
+ #[cfg(feature = "rocksdb")]
DatabaseSource::RocksDb { path, cache_size } =>
open_kvdb_rocksdb::<Block>(path, db_type, create, *cache_size)?,
DatabaseSource::Custom { db, require_create_flag } => {
@@ -266,7 +261,6 @@ impl From<OpenDbError> for sp_blockchain::Error {
}
}
-#[cfg(feature = "with-parity-db")]
impl From<parity_db::Error> for OpenDbError {
fn from(err: parity_db::Error) -> Self {
if matches!(err, parity_db::Error::DatabaseNotFound) {
@@ -287,7 +281,6 @@ impl From<io::Error> for OpenDbError {
}
}
-#[cfg(feature = "with-parity-db")]
fn open_parity_db<Block: BlockT>(path: &Path, db_type: DatabaseType, create: bool) -> OpenDbResult {
match crate::parity_db::open(path, db_type, create, false) {
Ok(db) => Ok(db),
@@ -300,16 +293,7 @@ fn open_parity_db<Block: BlockT>(path: &Path, db_type: DatabaseType, create: boo
}
}
-#[cfg(not(feature = "with-parity-db"))]
-fn open_parity_db<Block: BlockT>(
- _path: &Path,
- _db_type: DatabaseType,
- _create: bool,
-) -> OpenDbResult {
- Err(OpenDbError::NotEnabled("with-parity-db"))
-}
-
-#[cfg(any(feature = "with-kvdb-rocksdb", test))]
+#[cfg(any(feature = "rocksdb", test))]
fn open_kvdb_rocksdb<Block: BlockT>(
path: &Path,
db_type: DatabaseType,
@@ -359,7 +343,7 @@ fn open_kvdb_rocksdb<Block: BlockT>(
Ok(sp_database::as_database(db))
}
-#[cfg(not(any(feature = "with-kvdb-rocksdb", test)))]
+#[cfg(not(any(feature = "rocksdb", test)))]
fn open_kvdb_rocksdb<Block: BlockT>(
_path: &Path,
_db_type: DatabaseType,
@@ -602,7 +586,7 @@ mod tests {
use std::path::PathBuf;
type Block = RawBlock<ExtrinsicWrapper<u32>>;
- #[cfg(any(feature = "with-kvdb-rocksdb", test))]
+ #[cfg(any(feature = "rocksdb", test))]
#[test]
fn database_type_subdir_migration() {
type Block = RawBlock<ExtrinsicWrapper<u64>>;
@@ -639,7 +623,6 @@ mod tests {
"db_version",
);
- #[cfg(feature = "with-parity-db")]
check_dir_for_db_type(
DatabaseType::Full,
DatabaseSource::ParityDb { path: PathBuf::new() },
@@ -702,8 +685,6 @@ mod tests {
assert_eq!(joined.remaining_len().unwrap(), Some(0));
}
- #[cfg(feature = "with-parity-db")]
- #[cfg(any(feature = "with-kvdb-rocksdb", test))]
#[test]
fn test_open_database_auto_new() {
let db_dir = tempfile::TempDir::new().unwrap();
@@ -749,8 +730,6 @@ mod tests {
}
}
- #[cfg(feature = "with-parity-db")]
- #[cfg(any(feature = "with-kvdb-rocksdb", test))]
#[test]
fn test_open_database_rocksdb_new() {
let db_dir = tempfile::TempDir::new().unwrap();
@@ -801,8 +780,6 @@ mod tests {
}
}
- #[cfg(feature = "with-parity-db")]
- #[cfg(any(feature = "with-kvdb-rocksdb", test))]
#[test]
fn test_open_database_paritydb_new() {
let db_dir = tempfile::TempDir::new().unwrap();
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index 22bac652c30c4abe2c4aa6239cb92457fd68f04f..c1cb9e459041ba855a88e2870c4b2d4dc5f02916 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -13,10 +13,10 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]
[features]
-default = ["db"]
+default = ["rocksdb"]
# The RocksDB feature activates the RocksDB database backend. If it is not activated, and you pass
# a path to a database, an error will be produced at runtime.
-db = ["sc-client-db/with-kvdb-rocksdb", "sc-client-db/with-parity-db"]
+rocksdb = ["sc-client-db/rocksdb"]
wasmtime = ["sc-executor/wasmtime"]
# exposes the client type
test-helpers = []
diff --git a/substrate/test-utils/client/Cargo.toml b/substrate/test-utils/client/Cargo.toml
index 1ff7d0de1d6762a3d1be8b6dc83d424d8abc0df3..ce5ef2ffcc01aec25d496587c1a7feb351380065 100644
--- a/substrate/test-utils/client/Cargo.toml
+++ b/substrate/test-utils/client/Cargo.toml
@@ -19,7 +19,7 @@ hex = "0.4"
serde = "1.0.136"
serde_json = "1.0.79"
sc-client-api = { version = "4.0.0-dev", path = "../../client/api" }
-sc-client-db = { version = "0.10.0-dev", features = [
+sc-client-db = { version = "0.10.0-dev", default-features = false, features = [
"test-helpers",
], path = "../../client/db" }
sc-consensus = { version = "0.10.0-dev", path = "../../client/consensus/common" }
diff --git a/substrate/utils/frame/benchmarking-cli/Cargo.toml b/substrate/utils/frame/benchmarking-cli/Cargo.toml
index c4549f5c5439d7e2c99c9be0a06d6aec233d4bb4..ea26bf0c9261c9c4cb7749ca736cd7fbc443bdab 100644
--- a/substrate/utils/frame/benchmarking-cli/Cargo.toml
+++ b/substrate/utils/frame/benchmarking-cli/Cargo.toml
@@ -39,9 +39,9 @@ frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarkin
frame-support = { version = "4.0.0-dev", path = "../../../frame/support" }
frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
-sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
+sc-cli = { version = "0.10.0-dev", default-features = false, path = "../../../client/cli" }
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
-sc-client-db = { version = "0.10.0-dev", path = "../../../client/db" }
+sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../../../client/db" }
sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" }
sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" }
sc-sysinfo = { version = "6.0.0-dev", path = "../../../client/sysinfo" }
@@ -59,5 +59,6 @@ sp-trie = { version = "6.0.0", path = "../../../primitives/trie" }
gethostname = "0.2.3"
[features]
-default = ["db", "sc-client-db/runtime-benchmarks"]
-db = ["sc-client-db/with-kvdb-rocksdb", "sc-client-db/with-parity-db"]
+default = ["rocksdb", "runtime-benchmarks"]
+runtime-benchmarks = ["sc-client-db/runtime-benchmarks"]
+rocksdb = ["sc-cli/rocksdb", "sc-client-db/rocksdb"]