From 9b669edf22ebc0862141c574fd27bf5674f1981e Mon Sep 17 00:00:00 2001 From: Sebastian Kunert Date: Thu, 22 Sep 2022 10:45:58 +0200 Subject: [PATCH] Change visibility of `open_database` for use in cumulus (#6034) * Make some helper methods public * Make availability config const. --- polkadot/node/service/src/lib.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs index 6934571ab4..def059f2fa 100644 --- a/polkadot/node/service/src/lib.rs +++ b/polkadot/node/service/src/lib.rs @@ -292,7 +292,7 @@ impl IdentifyVariant for Box { } #[cfg(feature = "full-node")] -fn open_database(db_source: &DatabaseSource) -> Result, Error> { +pub fn open_database(db_source: &DatabaseSource) -> Result, Error> { let parachains_db = match db_source { DatabaseSource::RocksDb { path, .. } => parachains_db::open_creating_rocksdb( path.clone(), @@ -718,6 +718,11 @@ where Ok(leaves.into_iter().rev().take(MAX_ACTIVE_LEAVES).collect()) } +pub const AVAILABILITY_CONFIG: AvailabilityConfig = AvailabilityConfig { + col_data: parachains_db::REAL_COLUMNS.col_availability_data, + col_meta: parachains_db::REAL_COLUMNS.col_availability_meta, +}; + /// Create a new full node of arbitrary runtime and executor. /// /// This is an advanced feature and not recommended for general use. Generally, `build_full` is @@ -926,11 +931,6 @@ where let parachains_db = open_database(&config.database)?; - let availability_config = AvailabilityConfig { - col_data: parachains_db::REAL_COLUMNS.col_availability_data, - col_meta: parachains_db::REAL_COLUMNS.col_availability_meta, - }; - let approval_voting_config = ApprovalVotingConfig { col_data: parachains_db::REAL_COLUMNS.col_approval_data, slot_duration_millis: slot_duration.as_millis() as u64, @@ -1063,7 +1063,7 @@ where spawner, is_collator, approval_voting_config, - availability_config, + availability_config: AVAILABILITY_CONFIG, candidate_validation_config, chain_selection_config, dispute_coordinator_config,