Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use fake_runtime_api to simplify node code #3215

Merged
merged 2 commits into from
Dec 31, 2024
Merged

Use fake_runtime_api to simplify node code #3215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6991a32
Use fake_runtime_api to simplify code
Kailai-Wang Dec 20, 2024
28b1723
Merge branch 'dev' into use-fake-runtime-api
Kailai-Wang Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 21 additions & 38 deletions parachain/node/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,20 +171,10 @@ impl SubstrateCli for RelayChainCli {
macro_rules! construct_benchmark_partials {
($config:expr, |$partials:ident| $code:expr) => {
if $config.chain_spec.is_litentry() {
let $partials = new_partial::<litentry_parachain_runtime::RuntimeApi, _>(
&$config,
build_import_queue::<litentry_parachain_runtime::RuntimeApi>,
false,
true,
)?;
let $partials = new_partial::<_>(&$config, build_import_queue, false, true)?;
$code
} else if $config.chain_spec.is_paseo() {
let $partials = new_partial::<paseo_parachain_runtime::RuntimeApi, _>(
&$config,
build_import_queue::<paseo_parachain_runtime::RuntimeApi>,
false,
true,
)?;
let $partials = new_partial::<_>(&$config, build_import_queue, false, true)?;
$code
} else {
panic!("{}", UNSUPPORTED_CHAIN_MESSAGE)
Expand All @@ -199,11 +189,10 @@ macro_rules! construct_async_run {
if runner.config().chain_spec.is_litentry() {
runner.async_run(|$config| {
let $components = new_partial::<
litentry_parachain_runtime::RuntimeApi,
_
>(
&$config,
build_import_queue::<litentry_parachain_runtime::RuntimeApi>,
build_import_queue,
false,
$cli.delayed_best_block,
)?;
Expand All @@ -213,11 +202,10 @@ macro_rules! construct_async_run {
} else if runner.config().chain_spec.is_paseo() {
runner.async_run(|$config| {
let $components = new_partial::<
paseo_parachain_runtime::RuntimeApi,
_
>(
&$config,
build_import_queue::<paseo_parachain_runtime::RuntimeApi>,
build_import_queue,
false,
$cli.delayed_best_block,
)?;
Expand Down Expand Up @@ -286,24 +274,22 @@ pub fn run() -> Result<()> {
let runner = cli.create_runner(cmd)?;
if runner.config().chain_spec.is_litentry() {
runner.sync_run(|config| {
let sc_service::PartialComponents { client, .. } =
new_partial::<litentry_parachain_runtime::RuntimeApi, _>(
&config,
build_import_queue::<litentry_parachain_runtime::RuntimeApi>,
false,
cli.delayed_best_block,
)?;
let sc_service::PartialComponents { client, .. } = new_partial::<_>(
&config,
build_import_queue,
false,
cli.delayed_best_block,
)?;
cmd.run(client)
})
} else if runner.config().chain_spec.is_paseo() {
runner.sync_run(|config| {
let sc_service::PartialComponents { client, .. } =
new_partial::<paseo_parachain_runtime::RuntimeApi, _>(
&config,
build_import_queue::<paseo_parachain_runtime::RuntimeApi>,
false,
cli.delayed_best_block,
)?;
let sc_service::PartialComponents { client, .. } = new_partial::<_>(
&config,
build_import_queue,
false,
cli.delayed_best_block,
)?;
cmd.run(client)
})
} else {
Expand Down Expand Up @@ -383,12 +369,9 @@ pub fn run() -> Result<()> {

runner.run_node_until_exit(|config| async move {
if is_standalone {
return start_standalone_node::<paseo_parachain_runtime::RuntimeApi>(
config,
evm_tracing_config,
)
.await
.map_err(Into::into);
return start_standalone_node(config, evm_tracing_config)
.await
.map_err(Into::into);
}

let hwbench = if !cli.no_hardware_benchmarks {
Expand Down Expand Up @@ -429,7 +412,7 @@ pub fn run() -> Result<()> {
AdditionalConfig { evm_tracing_config, enable_evm_rpc: cli.enable_evm_rpc };

if config.chain_spec.is_litentry() {
start_node::<litentry_parachain_runtime::RuntimeApi>(
start_node(
config,
polkadot_config,
collator_options,
Expand All @@ -442,7 +425,7 @@ pub fn run() -> Result<()> {
.map(|r| r.0)
.map_err(Into::into)
} else if config.chain_spec.is_paseo() {
start_node::<paseo_parachain_runtime::RuntimeApi>(
start_node(
config,
polkadot_config,
collator_options,
Expand Down
Loading