pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-18 02:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Companion #13634] keystore overhaul (iter2) (#6913)

Browse Source 
* removed 'remote_keystore' parameter

* Keystore can't be None

* update lockfile for {"substrate"}

---------

Co-authored-by: parity-processbot <>
This commit is contained in:
Davide Galassi
2023-03-20 20:33:54 +01:00
committed by GitHub
parent 058082fcb0
commit e0b8b30288
3 changed files with 187 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+183 -183
View File
File diff suppressed because it is too large Load Diff
polkadot/node/service/src/lib.rs
+4 -13
View File
@@ -751,13 +751,11 @@ where
let chain_spec = config.chain_spec.cloned_box(); let chain_spec = config.chain_spec.cloned_box();
let local_keystore = basics.keystore_container.local_keystore(); let keystore = basics.keystore_container.local_keystore();
let auth_or_collator = role.is_authority() || is_collator.is_collator(); let auth_or_collator = role.is_authority() || is_collator.is_collator();
let requires_overseer_for_chain_sel = local_keystore.is_some() && auth_or_collator;
let pvf_checker_enabled = role.is_authority() && !is_collator.is_collator(); let pvf_checker_enabled = role.is_authority() && !is_collator.is_collator();
let select_chain = if requires_overseer_for_chain_sel { let select_chain = if auth_or_collator {
let metrics = let metrics =
polkadot_node_subsystem_util::metrics::Metrics::register(prometheus_registry.as_ref())?; polkadot_node_subsystem_util::metrics::Metrics::register(prometheus_registry.as_ref())?;
@@ -1000,14 +998,7 @@ where
None None
}; };
if local_keystore.is_none() { let overseer_handle = if let Some(authority_discovery_service) = authority_discovery_service {
gum::info!("Cannot run as validator without local keystore.");
}
let maybe_params =
local_keystore.and_then(move |k| authority_discovery_service.map(|a| (a, k)));
let overseer_handle = if let Some((authority_discovery_service, keystore)) = maybe_params {
let (overseer, overseer_handle) = overseer_gen let (overseer, overseer_handle) = overseer_gen
.generate::<service::SpawnTaskHandle, FullClient<RuntimeApi, ExecutorDispatch>>( .generate::<service::SpawnTaskHandle, FullClient<RuntimeApi, ExecutorDispatch>>(
overseer_connector, overseer_connector,
@@ -1071,7 +1062,7 @@ where
Some(handle) Some(handle)
} else { } else {
assert!( assert!(
!requires_overseer_for_chain_sel, !auth_or_collator,
"Precondition congruence (false) is guaranteed by manual checking. qed" "Precondition congruence (false) is guaranteed by manual checking. qed"
); );
None None
polkadot/node/test/service/src/lib.rs
-1
View File
@@ -173,7 +173,6 @@ pub fn node_config(
transaction_pool: Default::default(), transaction_pool: Default::default(),
network: network_config, network: network_config,
keystore: KeystoreConfig::InMemory, keystore: KeystoreConfig::InMemory,
keystore_remote: Default::default(),
database: DatabaseSource::RocksDb { path: root.join("db"), cache_size: 128 }, database: DatabaseSource::RocksDb { path: root.join("db"), cache_size: 128 },
trie_cache_maximum_size: Some(64 * 1024 * 1024), trie_cache_maximum_size: Some(64 * 1024 * 1024),
state_pruning: Default::default(), state_pruning: Default::default(),