relay-chain-interface: Do not depend on polkadot-service (#2287)

This commit is contained in:
Bastian Köcher
2023-03-07 15:17:05 +01:00
committed by GitHub
parent 4831e96de8
commit d17fbba4e4
8 changed files with 17 additions and 33 deletions
@@ -367,7 +367,8 @@ pub fn build_inprocess_relay_chain(
parachain_config,
telemetry_worker_handle,
hwbench,
)?;
)
.map_err(|e| RelayChainError::Application(Box::new(e) as Box<_>))?;
let relay_chain_interface_builder = RelayChainInProcessInterfaceBuilder {
polkadot_client: full_node.client.clone(),
@@ -6,7 +6,6 @@ edition = "2021"
[dependencies]
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
cumulus-primitives-core = { path = "../../primitives/core" }
@@ -17,7 +17,6 @@
use std::{collections::BTreeMap, pin::Pin, sync::Arc};
use polkadot_overseer::prometheus::PrometheusError;
use polkadot_service::SubstrateServiceError;
use sc_client_api::StorageProof;
use futures::Stream;
@@ -61,10 +60,8 @@ pub enum RelayChainError {
WorkerCommunicationError(String),
#[error("Scale codec deserialization error: {0}")]
DeserializationError(CodecError),
#[error("Polkadot service error: {0}")]
ServiceError(#[from] polkadot_service::Error),
#[error("Substrate service error: {0}")]
SubServiceError(#[from] SubstrateServiceError),
#[error(transparent)]
Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
#[error("Prometheus error: {0}")]
PrometheusError(#[from] PrometheusError),
#[error("Unspecified error occured: {0}")]
@@ -158,7 +158,8 @@ async fn new_minimal_relay_chain(
client: relay_chain_rpc_client.clone(),
spawn_handle: task_manager.spawn_handle(),
genesis_hash,
})?;
})
.map_err(|e| RelayChainError::Application(Box::new(e) as Box<_>))?;
let authority_discovery_service = build_authority_discovery_service(
&task_manager,
@@ -186,7 +187,8 @@ async fn new_minimal_relay_chain(
overseer_args,
&task_manager,
relay_chain_rpc_client.clone(),
)?;
)
.map_err(|e| RelayChainError::Application(Box::new(e) as Box<_>))?;
network_starter.start_network();