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

Cleanup light client leftovers (#11865)

Browse Source 
* Remove --light cli option

* Cleanup light client leftovers

* Remove commented-out code and clean-up more light client leftovers

* Fix formatting with `cargo +nightly fmt`

* Remove FIXME regarding db directory structure

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Dmitry Markin
2022-07-21 11:36:00 +03:00
committed by GitHub
parent 42c7df936e
commit b7ecd1af85
11 changed files with 44 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/cli/src/commands/run_cmd.rs
+3 -14
View File
@@ -50,10 +50,6 @@ pub struct RunCmd {
#[clap(long)]
pub no_grandpa: bool,
/// Experimental: Run in light client mode.
#[clap(long)]
pub light: bool,
/// Listen to all RPC interfaces.
///
/// Default is local. Note: not all RPC methods are safe to be exposed publicly. Use an RPC
@@ -337,7 +333,7 @@ impl CliConfiguration for RunCmd {
fn dev_key_seed(&self, is_dev: bool) -> Result<Option<String>> {
Ok(self.get_keyring().map(|a| format!("//{}", a)).or_else(|| {
if is_dev && !self.light {
if is_dev {
Some("//Alice".into())
} else {
None
@@ -363,16 +359,9 @@ impl CliConfiguration for RunCmd {
fn role(&self, is_dev: bool) -> Result<Role> {
let keyring = self.get_keyring();
let is_light = self.light;
let is_authority = (self.validator || is_dev || keyring.is_some()) && !is_light;
let is_authority = self.validator || is_dev || keyring.is_some();
Ok(if is_light {
sc_service::Role::Light
} else if is_authority {
sc_service::Role::Authority
} else {
sc_service::Role::Full
})
Ok(if is_authority { sc_service::Role::Authority } else { sc_service::Role::Full })
}
fn force_authoring(&self) -> Result<bool> {
substrate/client/cli/src/config.rs
+2 -6
View File
@@ -211,12 +211,8 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
base_path: &PathBuf,
cache_size: usize,
database: Database,
role: &Role,
) -> Result<DatabaseSource> {
let role_dir = match role {
Role::Light => "light",
Role::Full | Role::Authority => "full",
};
let role_dir = "full";
let rocksdb_path = base_path.join("db").join(role_dir);
let paritydb_path = base_path.join("paritydb").join(role_dir);
Ok(match database {
@@ -536,7 +532,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
)?,
keystore_remote,
keystore,
database: self.database_config(&config_dir, database_cache_size, database, &role)?,
database: self.database_config(&config_dir, database_cache_size, database)?,
state_cache_size: self.state_cache_size()?,
state_cache_child_ratio: self.state_cache_child_ratio()?,
state_pruning: self.state_pruning()?,