Unverified Commit 1dd53d43 authored by Cecile Tonglet's avatar Cecile Tonglet Committed by GitHub
Browse files

Companion PR for #7951 (#2336)

* Adapt code to changes in substrate

* WIP

* "Update Substrate"

Co-authored-by: parity-processbot <>
parent 36d41fd5
Pipeline #122327 failed with stages
in 34 minutes and 27 seconds
This diff is collapsed.
...@@ -216,7 +216,6 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, jaeger_agent: O ...@@ -216,7 +216,6 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, jaeger_agent: O
babe::BabeLink<Block> babe::BabeLink<Block>
), ),
grandpa::SharedVoterState, grandpa::SharedVoterState,
Option<telemetry::TelemetrySpan>,
) )
>, >,
Error Error
...@@ -232,7 +231,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, jaeger_agent: O ...@@ -232,7 +231,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, jaeger_agent: O
let inherent_data_providers = inherents::InherentDataProviders::new(); let inherent_data_providers = inherents::InherentDataProviders::new();
let (client, backend, keystore_container, task_manager, telemetry_span) = let (client, backend, keystore_container, task_manager) =
service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?; service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
let client = Arc::new(client); let client = Arc::new(client);
...@@ -336,7 +335,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, jaeger_agent: O ...@@ -336,7 +335,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, jaeger_agent: O
import_queue, import_queue,
transaction_pool, transaction_pool,
inherent_data_providers, inherent_data_providers,
other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry_span) other: (rpc_extensions_builder, import_setup, rpc_setup)
}) })
} }
...@@ -566,7 +565,7 @@ pub fn new_full<RuntimeApi, Executor>( ...@@ -566,7 +565,7 @@ pub fn new_full<RuntimeApi, Executor>(
import_queue, import_queue,
transaction_pool, transaction_pool,
inherent_data_providers, inherent_data_providers,
other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry_span) other: (rpc_extensions_builder, import_setup, rpc_setup)
} = new_partial::<RuntimeApi, Executor>(&mut config, jaeger_agent)?; } = new_partial::<RuntimeApi, Executor>(&mut config, jaeger_agent)?;
let prometheus_registry = config.prometheus_registry().cloned(); let prometheus_registry = config.prometheus_registry().cloned();
...@@ -631,7 +630,6 @@ pub fn new_full<RuntimeApi, Executor>( ...@@ -631,7 +630,6 @@ pub fn new_full<RuntimeApi, Executor>(
remote_blockchain: None, remote_blockchain: None,
network_status_sinks: network_status_sinks.clone(), network_status_sinks: network_status_sinks.clone(),
system_rpc_tx, system_rpc_tx,
telemetry_span,
})?; })?;
let (block_import, link_half, babe_link) = import_setup; let (block_import, link_half, babe_link) = import_setup;
...@@ -844,7 +842,7 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<( ...@@ -844,7 +842,7 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(
set_prometheus_registry(&mut config)?; set_prometheus_registry(&mut config)?;
use sc_client_api::backend::RemoteBackend; use sc_client_api::backend::RemoteBackend;
let (client, backend, keystore_container, mut task_manager, on_demand, telemetry_span) = let (client, backend, keystore_container, mut task_manager, on_demand) =
service::new_light_parts::<Block, Runtime, Dispatch>(&config)?; service::new_light_parts::<Block, Runtime, Dispatch>(&config)?;
let select_chain = sc_consensus::LongestChain::new(backend.clone()); let select_chain = sc_consensus::LongestChain::new(backend.clone());
...@@ -928,7 +926,6 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<( ...@@ -928,7 +926,6 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(
network, network,
network_status_sinks, network_status_sinks,
system_rpc_tx, system_rpc_tx,
telemetry_span,
})?; })?;
network_starter.start_network(); network_starter.start_network();
......
...@@ -199,6 +199,7 @@ pub fn node_config( ...@@ -199,6 +199,7 @@ pub fn node_config(
informant_output_format: Default::default(), informant_output_format: Default::default(),
disable_log_reloading: false, disable_log_reloading: false,
telemetry_handle: None, telemetry_handle: None,
telemetry_span: None,
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment