From 4966c2c5a706a7aeb7a77d3bd0bc9b64b2617069 Mon Sep 17 00:00:00 2001 From: Greg Zaitsev Date: Fri, 27 Sep 2024 13:15:03 -0400 Subject: [PATCH] Cleanup RPC create_full bounds --- node/src/rpc.rs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/node/src/rpc.rs b/node/src/rpc.rs index 5723a6fba..4f2063215 100644 --- a/node/src/rpc.rs +++ b/node/src/rpc.rs @@ -7,10 +7,9 @@ use std::{collections::BTreeMap, sync::Arc}; -use fp_rpc::{ConvertTransactionRuntimeApi, EthereumRuntimeRPCApi}; use futures::channel::mpsc; -use crate::ethereum::create_eth; +use crate::{client::RuntimeApiCollection, ethereum::create_eth}; pub use fc_rpc::EthBlockDataCacheTask; pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool}; use fc_storage::StorageOverride; @@ -28,10 +27,8 @@ use sc_rpc::SubscriptionTaskExecutor; use sc_transaction_pool::{ChainApi, Pool}; use sc_transaction_pool_api::TransactionPool; use sp_api::{CallApiAt, ProvideRuntimeApi}; -use sp_block_builder::BlockBuilder; use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata}; use sp_consensus_aura::sr25519::AuthorityId as AuraId; -use sp_consensus_aura::AuraApi; use sp_core::H256; use sp_inherents::CreateInherentDataProviders; use sp_runtime::traits::Block as BlockT; @@ -116,16 +113,7 @@ pub fn create_full( where B: BlockT, C: CallApiAt + ProvideRuntimeApi, - C::Api: BlockBuilder, - C::Api: AuraApi, - C::Api: substrate_frame_rpc_system::AccountNonceApi, - C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi, - C::Api: ConvertTransactionRuntimeApi, - C::Api: EthereumRuntimeRPCApi, - C::Api: subtensor_custom_rpc_runtime_api::DelegateInfoRuntimeApi, - C::Api: subtensor_custom_rpc_runtime_api::NeuronInfoRuntimeApi, - C::Api: subtensor_custom_rpc_runtime_api::SubnetInfoRuntimeApi, - C::Api: subtensor_custom_rpc_runtime_api::SubnetRegistrationRuntimeApi, + C::Api: RuntimeApiCollection, C: HeaderBackend + HeaderMetadata + 'static, C: BlockchainEvents + AuxStore + UsageProvider + StorageProvider, BE: Backend + 'static,