difftreelog
Merge branch 'develop' into release/opal-v918000
in: master
2 files changed
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -38,8 +38,12 @@
pub type OpalChainSpec = sc_service::GenericChainSpec<opal_runtime::GenesisConfig, Extensions>;
pub enum RuntimeId {
+ #[cfg(feature = "unique-runtime")]
Unique,
+
+ #[cfg(feature = "quartz-runtime")]
Quartz,
+
Opal,
Unknown(String),
}
node/cli/src/service.rsdiffbeforeafterboth616162use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};62use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};636364/// Native executor instance.64/// Unique native executor instance.65#[cfg(feature = "unique-runtime")]65pub struct UniqueRuntimeExecutor;66pub struct UniqueRuntimeExecutor;6768#[cfg(feature = "quartz-runtime")]69/// Quartz native executor instance.7066pub struct QuartzRuntimeExecutor;71pub struct QuartzRuntimeExecutor;7273/// Opal native executor instance.67pub struct OpalRuntimeExecutor;74pub struct OpalRuntimeExecutor;687569#[cfg(feature = "unique-runtime")]76#[cfg(feature = "unique-runtime")]