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

make polkadot-runtime optional feature (#3820)

Browse Source 
* make polkadot-runtime optional feature

* sprinkle some cfg statements

* ok

* ok, ok

* add CI check

* set -e

* chmod +x

* fixes

* fmt

* nicer compile errors

* Update outdated comments
This commit is contained in:
Andronik Ordian
2021-09-13 12:28:33 +02:00
committed by GitHub
parent 3d2c4db477
commit 33d7f9dd7b
10 changed files with 152 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/service/src/lib.rs
+47 -20
View File
@@ -82,11 +82,15 @@ pub use polkadot_client::WestendExecutorDispatch;
#[cfg(feature = "kusama-native")]
pub use polkadot_client::KusamaExecutorDispatch;
#[cfg(feature = "polkadot-native")]
pub use polkadot_client::PolkadotExecutorDispatch;
pub use chain_spec::{KusamaChainSpec, PolkadotChainSpec, RococoChainSpec, WestendChainSpec};
pub use consensus_common::{block_validation::Chain, Proposal, SelectChain};
#[cfg(feature = "full-node")]
pub use polkadot_client::{
AbstractClient, Client, ClientHandle, ExecuteWithClient, FullBackend, FullClient,
PolkadotExecutorDispatch, RuntimeApiCollection,
RuntimeApiCollection,
};
pub use polkadot_primitives::v1::{Block, BlockId, CollatorPair, Hash, Id as ParaId};
pub use sc_client_api::{Backend, CallExecutor, ExecutionStrategy};
@@ -110,6 +114,7 @@ pub use sp_runtime::{
#[cfg(feature = "kusama-native")]
pub use kusama_runtime;
#[cfg(feature = "polkadot-native")]
pub use polkadot_runtime;
#[cfg(feature = "rococo-native")]
pub use rococo_runtime;
@@ -226,6 +231,10 @@ pub enum Error {
#[cfg(feature = "full-node")]
#[error("Creating a custom database is required for validators")]
DatabasePathRequired,
#[cfg(feature = "full-node")]
#[error("Expected at least one of polkadot, kusama, westend or rococo runtime feature")]
NoRuntime,
}
/// Can be called for a `Configuration` to identify which network the configuration targets.
@@ -1268,13 +1277,19 @@ pub fn new_chain_ops(
return Ok((Arc::new(Client::Westend(client)), backend, import_queue, task_manager))
}
let service::PartialComponents { client, backend, import_queue, task_manager, .. } =
new_partial::<polkadot_runtime::RuntimeApi, PolkadotExecutorDispatch>(
config,
jaeger_agent,
None,
)?;
Ok((Arc::new(Client::Polkadot(client)), backend, import_queue, task_manager))
#[cfg(feature = "polkadot-native")]
{
let service::PartialComponents { client, backend, import_queue, task_manager, .. } =
new_partial::<polkadot_runtime::RuntimeApi, PolkadotExecutorDispatch>(
config,
jaeger_agent,
None,
)?;
return Ok((Arc::new(Client::Polkadot(client)), backend, import_queue, task_manager))
}
#[cfg(not(feature = "polkadot-native"))]
Err(Error::NoRuntime)
}
/// Build a new light node.
@@ -1295,7 +1310,13 @@ pub fn build_light(config: Configuration) -> Result<(TaskManager, RpcHandlers),
return new_light::<westend_runtime::RuntimeApi, WestendExecutorDispatch>(config)
}
new_light::<polkadot_runtime::RuntimeApi, PolkadotExecutorDispatch>(config)
#[cfg(feature = "polkadot-native")]
{
return new_light::<polkadot_runtime::RuntimeApi, PolkadotExecutorDispatch>(config)
}
#[cfg(not(feature = "polkadot-native"))]
Err(Error::NoRuntime)
}
#[cfg(feature = "full-node")]
@@ -1353,15 +1374,21 @@ pub fn build_full(
.map(|full| full.with_client(Client::Westend))
}
new_full::<polkadot_runtime::RuntimeApi, PolkadotExecutorDispatch, _>(
config,
is_collator,
grandpa_pause,
disable_beefy,
jaeger_agent,
telemetry_worker_handle,
None,
overseer_gen,
)
.map(|full| full.with_client(Client::Polkadot))
#[cfg(feature = "polkadot-native")]
{
return new_full::<polkadot_runtime::RuntimeApi, PolkadotExecutorDispatch, _>(
config,
is_collator,
grandpa_pause,
disable_beefy,
jaeger_agent,
telemetry_worker_handle,
None,
overseer_gen,
)
.map(|full| full.with_client(Client::Polkadot))
}
#[cfg(not(feature = "polkadot-native"))]
Err(Error::NoRuntime)
}