difftreelog
fix clippy warnings
in: master
12 files changed
Cargo.lockdiffbeforeafterboth10145 "sp-runtime",10145 "sp-runtime",10146 "sp-session",10146 "sp-session",10147 "sp-std",10147 "sp-std",10148 "sp-storage",10148 "sp-transaction-pool",10149 "sp-transaction-pool",10149 "sp-version",10150 "sp-version",10150 "staging-xcm",10151 "staging-xcm",14897 "sp-runtime",14898 "sp-runtime",14898 "sp-session",14899 "sp-session",14899 "sp-std",14900 "sp-std",14901 "sp-storage",14900 "sp-transaction-pool",14902 "sp-transaction-pool",14901 "sp-version",14903 "sp-version",14902 "staging-xcm",14904 "staging-xcm",node/cli/src/chain_spec.rsdiffbeforeafterboth238 vesting: VestingConfig { vesting: vec![] },238 vesting: VestingConfig { vesting: vec![] },239 parachain_info: ParachainInfoConfig {239 parachain_info: ParachainInfoConfig {240 parachain_id: $id.into(),240 parachain_id: $id.into(),241 Default::default()241 ..Default::default()242 },242 },243 aura: AuraConfig {243 aura: AuraConfig {244 authorities: $initial_invulnerables244 authorities: $initial_invulnerablesnode/cli/src/command.rsdiffbeforeafterboth399 Some(Subcommand::TryRuntime(cmd)) => {399 Some(Subcommand::TryRuntime(cmd)) => {400 use std::{future::Future, pin::Pin};400 use std::{future::Future, pin::Pin};401401402 use polkadot_cli::Block;402 use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};403 use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};403 use try_runtime_cli::block_building_info::timestamp_with_aura_info;404 use try_runtime_cli::block_building_info::timestamp_with_aura_info;404405node/cli/src/rpc.rsdiffbeforeafterboth67}67}686869/// Instantiate all Full RPC extensions.69/// Instantiate all Full RPC extensions.70pub fn create_full<C, P, SC, R, A, B>(70pub fn create_full<C, P, SC, R, B>(71 io: &mut RpcModule<()>,71 io: &mut RpcModule<()>,72 deps: FullDeps<C, P, SC>,72 deps: FullDeps<C, P, SC>,73) -> Result<(), Box<dyn std::error::Error + Send + Sync>>73) -> Result<(), Box<dyn std::error::Error + Send + Sync>>244 EthFilter::new(244 EthFilter::new(245 client.clone(),245 client.clone(),246 eth_backend,246 eth_backend,247 graph.clone(),247 graph,248 filter_pool,248 filter_pool,249 500_usize, // max stored filters249 500_usize, // max stored filters250 max_past_logs,250 max_past_logs,node/cli/src/service.rsdiffbeforeafterboth498 select_chain,498 select_chain,499 };499 };500500501 create_full::<_, _, _, Runtime, RuntimeApi, _>(&mut rpc_handle, full_deps)?;501 create_full::<_, _, _, Runtime, _>(&mut rpc_handle, full_deps)?;502502503 let eth_deps = EthDeps {503 let eth_deps = EthDeps {504 client,504 client,547 config: parachain_config,547 config: parachain_config,548 keystore: params.keystore_container.keystore(),548 keystore: params.keystore_container.keystore(),549 backend: backend.clone(),549 backend: backend.clone(),550 network: network.clone(),550 network,551 sync_service: sync_service.clone(),551 sync_service: sync_service.clone(),552 system_rpc_tx,552 system_rpc_tx,553 telemetry: telemetry.as_mut(),553 telemetry: telemetry.as_mut(),600 if validator {600 if validator {601 start_consensus(601 start_consensus(602 client.clone(),602 client.clone(),603 transaction_pool,604 StartConsensusParameters {603 backend.clone(),605 backend: backend.clone(),604 prometheus_registry.as_ref(),606 prometheus_registry: prometheus_registry.as_ref(),605 telemetry.as_ref().map(|t| t.handle()),607 telemetry: telemetry.as_ref().map(|t| t.handle()),606 &task_manager,608 task_manager: &task_manager,607 relay_chain_interface.clone(),609 relay_chain_interface: relay_chain_interface.clone(),608 transaction_pool,609 sync_service.clone(),610 sync_oracle: sync_service,610 params.keystore_container.keystore(),611 keystore: params.keystore_container.keystore(),611 overseer_handle,612 overseer_handle,612 relay_chain_slot_duration,613 relay_chain_slot_duration,613 para_id,614 para_id,614 collator_key.expect("cli args do not allow this"),615 collator_key: collator_key.expect("cli args do not allow this"),615 announce_block,616 announce_block,617 }616 )?;618 )?;617 }619 }618620670 .map_err(Into::into)672 .map_err(Into::into)671}673}672674673pub fn start_consensus<ExecutorDispatch, RuntimeApi, Runtime>(675pub struct StartConsensusParameters<'a> {674 client: Arc<FullClient<RuntimeApi, ExecutorDispatch>>,675 backend: Arc<FullBackend>,676 backend: Arc<FullBackend>,676 prometheus_registry: Option<&Registry>,677 prometheus_registry: Option<&'a Registry>,677 telemetry: Option<TelemetryHandle>,678 telemetry: Option<TelemetryHandle>,678 task_manager: &TaskManager,679 task_manager: &'a TaskManager,679 relay_chain_interface: Arc<dyn RelayChainInterface>,680 relay_chain_interface: Arc<dyn RelayChainInterface>,680 transaction_pool: Arc<681 sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,682 >,683 sync_oracle: Arc<SyncingService<Block>>,681 sync_oracle: Arc<SyncingService<Block>>,684 keystore: KeystorePtr,682 keystore: KeystorePtr,685 overseer_handle: OverseerHandle,683 overseer_handle: OverseerHandle,686 relay_chain_slot_duration: Duration,684 relay_chain_slot_duration: Duration,687 para_id: ParaId,685 para_id: ParaId,688 collator_key: CollatorPair,686 collator_key: CollatorPair,689 announce_block: Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,687 announce_block: Arc<dyn Fn(Hash, Option<Vec<u8>>) + Send + Sync>,688}689690pub fn start_consensus<ExecutorDispatch, RuntimeApi, Runtime>(691 client: Arc<FullClient<RuntimeApi, ExecutorDispatch>>,692 transaction_pool: Arc<693 sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,694 >,695 parameters: StartConsensusParameters<'_>,690) -> Result<(), sc_service::Error>696) -> Result<(), sc_service::Error>691where697where692 ExecutorDispatch: NativeExecutionDispatch + 'static,698 ExecutorDispatch: NativeExecutionDispatch + 'static,693 RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>699 RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>697 RuntimeApi::RuntimeApi: RuntimeApiDep<Runtime> + 'static,703 RuntimeApi::RuntimeApi: RuntimeApiDep<Runtime> + 'static,698 Runtime: RuntimeInstance,704 Runtime: RuntimeInstance,699{705{706 let StartConsensusParameters {707 backend,708 prometheus_registry,709 telemetry,710 task_manager,711 relay_chain_interface,712 sync_oracle,713 keystore,714 overseer_handle,715 relay_chain_slot_duration,716 para_id,717 collator_key,718 announce_block,719 } = parameters;700 let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;720 let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;701721702 let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(722 let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(703 task_manager.spawn_handle(),723 task_manager.spawn_handle(),704 client.clone(),724 client.clone(),705 transaction_pool,725 transaction_pool,706 prometheus_registry,726 prometheus_registry,707 telemetry.clone(),727 telemetry,708 );728 );709 let proposer = Proposer::new(proposer_factory);729 let proposer = Proposer::new(proposer_factory);7107301043 select_chain,1063 select_chain,1044 };1064 };104510651046 create_full::<_, _, _, Runtime, RuntimeApi, _>(&mut rpc_module, full_deps)?;1066 create_full::<_, _, _, Runtime, _>(&mut rpc_module, full_deps)?;104710671048 let eth_deps = EthDeps {1068 let eth_deps = EthDeps {1049 client,1069 client,pallets/app-promotion/src/benchmarking.rsdiffbeforeafterboth161 T::RelayBlockNumberProvider::set_block_number(30_000.into());161 T::RelayBlockNumberProvider::set_block_number(30_000.into());162162163 #[extrinsic_call]163 #[extrinsic_call]164 _(RawOrigin::Signed(pallet_admin.clone()), Some(b as u8));164 _(RawOrigin::Signed(pallet_admin), Some(b as u8));165165166 Ok(())166 Ok(())167 }167 }178178179 #[extrinsic_call]179 #[extrinsic_call]180 _(180 _(181 RawOrigin::Signed(caller.clone()),181 RawOrigin::Signed(caller),182 share * <T as Config>::Currency::total_balance(&caller),182 share * <T as Config>::Currency::total_balance(&caller),183 );183 );184184211 .collect::<Result<Vec<_>, _>>()?;211 .collect::<Result<Vec<_>, _>>()?;212212213 #[extrinsic_call]213 #[extrinsic_call]214 _(RawOrigin::Signed(caller.clone()));214 _(RawOrigin::Signed(caller));215215216 Ok(())216 Ok(())217 }217 }242242243 #[extrinsic_call]243 #[extrinsic_call]244 _(244 _(245 RawOrigin::Signed(caller.clone()),245 RawOrigin::Signed(caller),246 Into::<BalanceOf<T>>::into(1000u128) * T::Nominal::get(),246 Into::<BalanceOf<T>>::into(1000u128) * T::Nominal::get(),247 );247 );248248268 let collection = create_nft_collection::<T>(caller)?;268 let collection = create_nft_collection::<T>(caller)?;269269270 #[extrinsic_call]270 #[extrinsic_call]271 _(RawOrigin::Signed(pallet_admin.clone()), collection);271 _(RawOrigin::Signed(pallet_admin), collection);272272273 Ok(())273 Ok(())274 }274 }296 )?;296 )?;297297298 #[extrinsic_call]298 #[extrinsic_call]299 _(RawOrigin::Signed(pallet_admin.clone()), collection);299 _(RawOrigin::Signed(pallet_admin), collection);300300301 Ok(())301 Ok(())302 }302 }319 <EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;319 <EvmMigrationPallet<T>>::finish(RawOrigin::Root.into(), address, data)?;320320321 #[extrinsic_call]321 #[extrinsic_call]322 _(RawOrigin::Signed(pallet_admin.clone()), address);322 _(RawOrigin::Signed(pallet_admin), address);323323324 Ok(())324 Ok(())325 }325 }346 )?;346 )?;347347348 #[extrinsic_call]348 #[extrinsic_call]349 _(RawOrigin::Signed(pallet_admin.clone()), address);349 _(RawOrigin::Signed(pallet_admin), address);350350351 Ok(())351 Ok(())352 }352 }pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth757576 #[block]76 #[block]77 {77 {78 create_max_item(&collection, &sender, to.clone())?;78 create_max_item(&collection, &sender, to)?;79 }79 }808081 Ok(())81 Ok(())pallets/refungible/src/benchmarking.rsdiffbeforeafterboth828283 #[block]83 #[block]84 {84 {85 create_max_item(&collection, &sender, [(to.clone(), 200)])?;85 create_max_item(&collection, &sender, [(to, 200)])?;86 }86 }878788 Ok(())88 Ok(())pallets/unique/src/benchmarking.rsdiffbeforeafterboth107 let collection = create_nft_collection::<T>(caller.clone())?;107 let collection = create_nft_collection::<T>(caller.clone())?;108108109 #[extrinsic_call]109 #[extrinsic_call]110 _(RawOrigin::Signed(caller.clone()), collection);110 _(RawOrigin::Signed(caller), collection);111111112 Ok(())112 Ok(())113 }113 }120120121 #[extrinsic_call]121 #[extrinsic_call]122 _(122 _(123 RawOrigin::Signed(caller.clone()),123 RawOrigin::Signed(caller),124 collection,124 collection,125 T::CrossAccountId::from_sub(allowlist_account),125 T::CrossAccountId::from_sub(allowlist_account),126 );126 );141141142 #[extrinsic_call]142 #[extrinsic_call]143 _(143 _(144 RawOrigin::Signed(caller.clone()),144 RawOrigin::Signed(caller),145 collection,145 collection,146 T::CrossAccountId::from_sub(allowlist_account),146 T::CrossAccountId::from_sub(allowlist_account),147 );147 );156 let new_owner: T::AccountId = account("admin", 0, SEED);156 let new_owner: T::AccountId = account("admin", 0, SEED);157157158 #[extrinsic_call]158 #[extrinsic_call]159 _(RawOrigin::Signed(caller.clone()), collection, new_owner);159 _(RawOrigin::Signed(caller), collection, new_owner);160160161 Ok(())161 Ok(())162 }162 }169169170 #[extrinsic_call]170 #[extrinsic_call]171 _(171 _(172 RawOrigin::Signed(caller.clone()),172 RawOrigin::Signed(caller),173 collection,173 collection,174 T::CrossAccountId::from_sub(new_admin),174 T::CrossAccountId::from_sub(new_admin),175 );175 );190190191 #[extrinsic_call]191 #[extrinsic_call]192 _(192 _(193 RawOrigin::Signed(caller.clone()),193 RawOrigin::Signed(caller),194 collection,194 collection,195 T::CrossAccountId::from_sub(new_admin),195 T::CrossAccountId::from_sub(new_admin),196 );196 );205205206 #[extrinsic_call]206 #[extrinsic_call]207 _(207 _(RawOrigin::Signed(caller), collection, caller.clone());208 RawOrigin::Signed(caller.clone()),209 collection,210 caller.clone(),211 );212208213 Ok(())209 Ok(())224 )?;220 )?;225221226 #[extrinsic_call]222 #[extrinsic_call]227 _(RawOrigin::Signed(caller.clone()), collection);223 _(RawOrigin::Signed(caller), collection);228224229 Ok(())225 Ok(())230 }226 }241 <Pallet<T>>::confirm_sponsorship(RawOrigin::Signed(caller.clone()).into(), collection)?;237 <Pallet<T>>::confirm_sponsorship(RawOrigin::Signed(caller.clone()).into(), collection)?;242238243 #[extrinsic_call]239 #[extrinsic_call]244 _(RawOrigin::Signed(caller.clone()), collection);240 _(RawOrigin::Signed(caller), collection);245241246 Ok(())242 Ok(())247 }243 }252 let collection = create_nft_collection::<T>(caller.clone())?;248 let collection = create_nft_collection::<T>(caller.clone())?;253249254 #[extrinsic_call]250 #[extrinsic_call]255 _(RawOrigin::Signed(caller.clone()), collection, false);251 _(RawOrigin::Signed(caller), collection, false);256252257 Ok(())253 Ok(())258 }254 }275 };271 };276272277 #[extrinsic_call]273 #[extrinsic_call]278 set_collection_limits(RawOrigin::Signed(caller.clone()), collection, cl);274 set_collection_limits(RawOrigin::Signed(caller), collection, cl);279275280 Ok(())276 Ok(())281 }277 }runtime/common/config/xcm/foreignassets.rsdiffbeforeafterboth77 let here_id =77 let here_id =78 ConvertAssetId::convert(&AssetId::NativeAssetId(NativeCurrency::Here)).unwrap();78 ConvertAssetId::convert(&AssetId::NativeAssetId(NativeCurrency::Here)).unwrap();797980 if asset_id.clone() == parent_id {80 if *asset_id == parent_id {81 return Some(MultiLocation::parent());81 return Some(MultiLocation::parent());82 }82 }838384 if asset_id.clone() == here_id {84 if *asset_id == here_id {85 return Some(MultiLocation::new(85 return Some(MultiLocation::new(86 1,86 1,87 X1(Parachain(ParachainInfo::get().into())),87 X1(Parachain(ParachainInfo::get().into())),88 ));88 ));89 }89 }909091 let fid =91 let fid = <AssetId as TryAsForeign<AssetId, ForeignAssetId>>::try_as_foreign(*asset_id)?;92 <AssetId as TryAsForeign<AssetId, ForeignAssetId>>::try_as_foreign(asset_id.clone())?;93 XcmForeignAssetIdMapping::<Runtime>::get_multi_location(fid)92 XcmForeignAssetIdMapping::<Runtime>::get_multi_location(fid)94 }93 }95}94}runtime/quartz/Cargo.tomldiffbeforeafterboth271sp-runtime = { workspace = true }271sp-runtime = { workspace = true }272sp-session = { workspace = true }272sp-session = { workspace = true }273sp-std = { workspace = true }273sp-std = { workspace = true }274sp-storage = { workspace = true }274sp-transaction-pool = { workspace = true }275sp-transaction-pool = { workspace = true }275sp-version = { workspace = true }276sp-version = { workspace = true }276staging-xcm = { workspace = true }277staging-xcm = { workspace = true }runtime/unique/Cargo.tomldiffbeforeafterboth274sp-runtime = { workspace = true }274sp-runtime = { workspace = true }275sp-session = { workspace = true }275sp-session = { workspace = true }276sp-std = { workspace = true }276sp-std = { workspace = true }277sp-storage = { workspace = true }277sp-transaction-pool = { workspace = true }278sp-transaction-pool = { workspace = true }278sp-version = { workspace = true }279sp-version = { workspace = true }279staging-xcm = { workspace = true }280staging-xcm = { workspace = true }