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

Cleanup light client leftovers (#5794)

Browse Source 
* Cleanup light client leftovers

* Remove light clent leftovers in test-parachains

* update lockfile for {"substrate"}

Co-authored-by: parity-processbot <>
This commit is contained in:
Dmitry Markin
2022-07-21 12:31:12 +03:00
committed by GitHub
parent 54cbfa0afd
commit b30b7c6022
4 changed files with 264 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+171 -171
View File
File diff suppressed because it is too large Load Diff
polkadot/cli/src/command.rs
+15 -20
View File
@@ -21,7 +21,7 @@ use log::info;
use polkadot_client::benchmarking::{ use polkadot_client::benchmarking::{
benchmark_inherent_data, ExistentialDepositProvider, RemarkBuilder, TransferKeepAliveBuilder, benchmark_inherent_data, ExistentialDepositProvider, RemarkBuilder, TransferKeepAliveBuilder,
}; };
use sc_cli::{Role, RuntimeVersion, SubstrateCli}; use sc_cli::{RuntimeVersion, SubstrateCli};
use service::{self, HeaderBackend, IdentifyVariant}; use service::{self, HeaderBackend, IdentifyVariant};
use sp_core::crypto::Ss58AddressFormatRegistry; use sp_core::crypto::Ss58AddressFormatRegistry;
use sp_keyring::Sr25519Keyring; use sp_keyring::Sr25519Keyring;
@@ -330,25 +330,20 @@ where
None None
}; };
let role = config.role.clone(); service::build_full(
config,
match role { service::IsCollator::No,
Role::Light => Err(Error::Other("Light client not enabled".into())), grandpa_pause,
_ => service::build_full( cli.run.beefy,
config, jaeger_agent,
service::IsCollator::No, None,
grandpa_pause, false,
cli.run.beefy, overseer_gen,
jaeger_agent, cli.run.overseer_channel_capacity_override,
None, hwbench,
false, )
overseer_gen, .map(|full| full.task_manager)
cli.run.overseer_channel_capacity_override, .map_err(Into::into)
hwbench,
)
.map(|full| full.task_manager)
.map_err(Into::into),
}
}) })
} }
polkadot/parachain/test-parachains/adder/collator/src/main.rs
+39 -47
View File
@@ -20,7 +20,7 @@ use polkadot_cli::{Error, Result};
use polkadot_node_primitives::CollationGenerationConfig; use polkadot_node_primitives::CollationGenerationConfig;
use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage}; use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
use polkadot_primitives::v2::Id as ParaId; use polkadot_primitives::v2::Id as ParaId;
use sc_cli::{Error as SubstrateCliError, Role, SubstrateCli}; use sc_cli::{Error as SubstrateCliError, SubstrateCli};
use sp_core::hexdisplay::HexDisplay; use sp_core::hexdisplay::HexDisplay;
use test_parachain_adder_collator::Collator; use test_parachain_adder_collator::Collator;
@@ -54,59 +54,51 @@ fn main() -> Result<()> {
})?; })?;
runner.run_node_until_exit(|config| async move { runner.run_node_until_exit(|config| async move {
let role = config.role.clone(); let collator = Collator::new();
match role { let full_node = polkadot_service::build_full(
Role::Light => Err("Light client not supported".into()), config,
_ => { polkadot_service::IsCollator::Yes(collator.collator_key()),
let collator = Collator::new(); None,
false,
None,
None,
false,
polkadot_service::RealOverseerGen,
None,
None,
)
.map_err(|e| e.to_string())?;
let mut overseer_handle = full_node
.overseer_handle
.expect("Overseer handle should be initialized for collators");
let full_node = polkadot_service::build_full( let genesis_head_hex =
config, format!("0x{:?}", HexDisplay::from(&collator.genesis_head()));
polkadot_service::IsCollator::Yes(collator.collator_key()), let validation_code_hex =
None, format!("0x{:?}", HexDisplay::from(&collator.validation_code()));
false,
None,
None,
false,
polkadot_service::RealOverseerGen,
None,
None,
)
.map_err(|e| e.to_string())?;
let mut overseer_handle = full_node
.overseer_handle
.expect("Overseer handle should be initialized for collators");
let genesis_head_hex = let para_id = cli.run.parachain_id.map(ParaId::from).unwrap_or(DEFAULT_PARA_ID);
format!("0x{:?}", HexDisplay::from(&collator.genesis_head()));
let validation_code_hex =
format!("0x{:?}", HexDisplay::from(&collator.validation_code()));
let para_id = log::info!("Running adder collator for parachain id: {}", para_id);
cli.run.parachain_id.map(ParaId::from).unwrap_or(DEFAULT_PARA_ID); log::info!("Genesis state: {}", genesis_head_hex);
log::info!("Validation code: {}", validation_code_hex);
log::info!("Running adder collator for parachain id: {}", para_id); let config = CollationGenerationConfig {
log::info!("Genesis state: {}", genesis_head_hex); key: collator.collator_key(),
log::info!("Validation code: {}", validation_code_hex); collator: collator
.create_collation_function(full_node.task_manager.spawn_handle()),
para_id,
};
overseer_handle
.send_msg(CollationGenerationMessage::Initialize(config), "Collator")
.await;
let config = CollationGenerationConfig { overseer_handle
key: collator.collator_key(), .send_msg(CollatorProtocolMessage::CollateOn(para_id), "Collator")
collator: collator .await;
.create_collation_function(full_node.task_manager.spawn_handle()),
para_id,
};
overseer_handle
.send_msg(CollationGenerationMessage::Initialize(config), "Collator")
.await;
overseer_handle Ok(full_node.task_manager)
.send_msg(CollatorProtocolMessage::CollateOn(para_id), "Collator")
.await;
Ok(full_node.task_manager)
},
}
}) })
}, },
}?; }?;
polkadot/parachain/test-parachains/undying/collator/src/main.rs
+39 -46
View File
@@ -20,7 +20,7 @@ use polkadot_cli::{Error, Result};
use polkadot_node_primitives::CollationGenerationConfig; use polkadot_node_primitives::CollationGenerationConfig;
use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage}; use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
use polkadot_primitives::v2::Id as ParaId; use polkadot_primitives::v2::Id as ParaId;
use sc_cli::{Error as SubstrateCliError, Role, SubstrateCli}; use sc_cli::{Error as SubstrateCliError, SubstrateCli};
use sp_core::hexdisplay::HexDisplay; use sp_core::hexdisplay::HexDisplay;
use test_parachain_undying_collator::Collator; use test_parachain_undying_collator::Collator;
@@ -54,58 +54,51 @@ fn main() -> Result<()> {
})?; })?;
runner.run_node_until_exit(|config| async move { runner.run_node_until_exit(|config| async move {
let role = config.role.clone(); let collator = Collator::new(cli.run.pov_size, cli.run.pvf_complexity);
match role { let full_node = polkadot_service::build_full(
Role::Light => Err("Light client not supported".into()), config,
_ => { polkadot_service::IsCollator::Yes(collator.collator_key()),
let collator = Collator::new(cli.run.pov_size, cli.run.pvf_complexity); None,
false,
None,
None,
false,
polkadot_service::RealOverseerGen,
None,
None,
)
.map_err(|e| e.to_string())?;
let mut overseer_handle = full_node
.overseer_handle
.expect("Overseer handle should be initialized for collators");
let full_node = polkadot_service::build_full( let genesis_head_hex =
config, format!("0x{:?}", HexDisplay::from(&collator.genesis_head()));
polkadot_service::IsCollator::Yes(collator.collator_key()), let validation_code_hex =
None, format!("0x{:?}", HexDisplay::from(&collator.validation_code()));
false,
None,
None,
false,
polkadot_service::RealOverseerGen,
None,
None,
)
.map_err(|e| e.to_string())?;
let mut overseer_handle = full_node
.overseer_handle
.expect("Overseer handle should be initialized for collators");
let genesis_head_hex = let para_id = ParaId::from(cli.run.parachain_id);
format!("0x{:?}", HexDisplay::from(&collator.genesis_head()));
let validation_code_hex =
format!("0x{:?}", HexDisplay::from(&collator.validation_code()));
let para_id = ParaId::from(cli.run.parachain_id); log::info!("Running `Undying` collator for parachain id: {}", para_id);
log::info!("Genesis state: {}", genesis_head_hex);
log::info!("Validation code: {}", validation_code_hex);
log::info!("Running `Undying` collator for parachain id: {}", para_id); let config = CollationGenerationConfig {
log::info!("Genesis state: {}", genesis_head_hex); key: collator.collator_key(),
log::info!("Validation code: {}", validation_code_hex); collator: collator
.create_collation_function(full_node.task_manager.spawn_handle()),
para_id,
};
overseer_handle
.send_msg(CollationGenerationMessage::Initialize(config), "Collator")
.await;
let config = CollationGenerationConfig { overseer_handle
key: collator.collator_key(), .send_msg(CollatorProtocolMessage::CollateOn(para_id), "Collator")
collator: collator .await;
.create_collation_function(full_node.task_manager.spawn_handle()),
para_id,
};
overseer_handle
.send_msg(CollationGenerationMessage::Initialize(config), "Collator")
.await;
overseer_handle Ok(full_node.task_manager)
.send_msg(CollatorProtocolMessage::CollateOn(para_id), "Collator")
.await;
Ok(full_node.task_manager)
},
}
}) })
}, },
}?; }?;