Prefix logs of parachain and relaychain differently + remove light client of relay chain (#109)

This commit is contained in:
Cecile Tonglet
2020-06-11 12:39:20 +02:00
committed by GitHub
parent 0326d049c5
commit 6be8cf3f20
5 changed files with 162 additions and 169 deletions
+4 -18
View File
@@ -24,8 +24,7 @@ use sc_cli::{
SubstrateCli,
};
use sc_executor::NativeExecutionDispatch;
use sc_network::config::TransportConfig;
use sc_service::config::{NetworkConfiguration, NodeKeyConfig, PrometheusConfig};
use sc_service::config::PrometheusConfig;
use sp_core::hexdisplay::HexDisplay;
use sp_runtime::{
traits::{Block as BlockT, Hash as HashT, Header as HeaderT, Zero},
@@ -186,7 +185,8 @@ pub fn run() -> Result<()> {
None,
authority_discovery_enabled,
6000,
grandpa_pause
grandpa_pause,
None,
).map(|(s, _, _)| s)
},
polkadot_service::PolkadotExecutor::native_version().runtime_version
@@ -203,7 +203,6 @@ pub fn run() -> Result<()> {
// TODO
let key = Arc::new(sp_core::Pair::from_seed(&[10; 32]));
let key2 = Arc::new(sp_core::Pair::from_seed(&[10; 32]));
let mut polkadot_cli = PolkadotCli::from_iter(
[PolkadotCli::executable_name().to_string()]
@@ -213,20 +212,7 @@ pub fn run() -> Result<()> {
polkadot_cli.base_path = cli.run.base_path()?.map(|x| x.join("polkadot"));
runner.run_node(
|config| {
let task_executor = config.task_executor.clone();
let polkadot_config = SubstrateCli::create_configuration(
&polkadot_cli,
&polkadot_cli,
task_executor,
)
.unwrap();
info!("Parachain id: {:?}", crate::PARA_ID);
crate::service::run_collator(config, key2, polkadot_config)
},
runner.run_full_node(
|config| {
let task_executor = config.task_executor.clone();
let polkadot_config = SubstrateCli::create_configuration(