warnings clippy

Moonsong-Labs · Sep 5, 2023 · 433a55c · 433a55c
1 parent 5b0e158
commit 433a55c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/template/node/src/chain_spec.rs b/template/node/src/chain_spec.rs
@@ -8,7 +8,7 @@ use sp_runtime::traits::{IdentifyAccount, Verify};
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
 pub type ChainSpec =
-	sc_service::GenericChainSpec<moonkit_template_runtime::GenesisConfig, Extensions>;
+	sc_service::GenericChainSpec<moonkit_template_runtime::RuntimeGenesisConfig, Extensions>;
 
 /// Helper function to generate a crypto pair from seed
 pub fn get_pair_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
@@ -165,8 +165,8 @@ fn testnet_genesis(
 	authorities: Vec<(AccountId, NimbusId)>,
 	endowed_accounts: Vec<AccountId>,
 	id: ParaId,
-) -> moonkit_template_runtime::GenesisConfig {
-	moonkit_template_runtime::GenesisConfig {
+) -> moonkit_template_runtime::RuntimeGenesisConfig {
+	moonkit_template_runtime::RuntimeGenesisConfig {
 		system: moonkit_template_runtime::SystemConfig {
 			code: moonkit_template_runtime::WASM_BINARY
 				.expect("WASM binary was not build, please build it!")

diff --git a/template/node/src/command.rs b/template/node/src/command.rs
@@ -1,18 +1,15 @@
 use std::net::SocketAddr;
 
-use cumulus_client_cli::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::BenchmarkCmd;
 use log::info;
 use moonkit_template_runtime::{Block, RuntimeApi};
-use parity_scale_codec::Encode;
 use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,
-	NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,
+	NetworkParams, Result, SharedParams, SubstrateCli,
 };
 use sc_service::config::{BasePath, PrometheusConfig};
-use sp_core::hexdisplay::HexDisplay;
-use sp_runtime::traits::{AccountIdConversion, Block as BlockT};
+use sp_runtime::traits::AccountIdConversion;
 
 use crate::{
 	chain_spec,

diff --git a/template/node/src/service.rs b/template/node/src/service.rs
@@ -13,7 +13,7 @@ use nimbus_consensus::{
 // Cumulus Imports
 use cumulus_client_cli::CollatorOptions;
 use cumulus_client_consensus_common::ParachainConsensus;
-use cumulus_client_network::BlockAnnounceValidator;
+use cumulus_client_network::RequireSecondedInBlockAnnounce;
 use cumulus_client_service::{
 	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
 };
@@ -285,7 +285,7 @@ where
 	.await
 	.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
 
-	let block_announce_validator = BlockAnnounceValidator::new(relay_chain_interface.clone(), id);
+	let block_announce_validator = RequireSecondedInBlockAnnounce::new(relay_chain_interface.clone(), id);
 
 	let force_authoring = parachain_config.force_authoring;
 	let validator = parachain_config.role.is_authority();