From 2dfd736430105beb0507a2e42936d64e8505d667 Mon Sep 17 00:00:00 2001 From: Igor Kozyrev Date: Tue, 29 Mar 2022 13:58:42 +0000 Subject: [PATCH] Merge branch 'develop' into release/opal-v918000 --- --- a/node/cli/src/chain_spec.rs +++ b/node/cli/src/chain_spec.rs @@ -38,8 +38,12 @@ pub type OpalChainSpec = sc_service::GenericChainSpec; pub enum RuntimeId { + #[cfg(feature = "unique-runtime")] Unique, + + #[cfg(feature = "quartz-runtime")] Quartz, + Opal, Unknown(String), } --- a/node/cli/src/service.rs +++ b/node/cli/src/service.rs @@ -61,9 +61,16 @@ use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block}; -/// Native executor instance. +/// Unique native executor instance. +#[cfg(feature = "unique-runtime")] pub struct UniqueRuntimeExecutor; + +#[cfg(feature = "quartz-runtime")] +/// Quartz native executor instance. + pub struct QuartzRuntimeExecutor; + +/// Opal native executor instance. pub struct OpalRuntimeExecutor; #[cfg(feature = "unique-runtime")] -- gitstuff