difftreelog
build remove RMRK usage
in: master
6 files changed
node/cli/src/service.rsdiffbeforeafterboth68use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};68use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};696970// RMRK70// RMRK71use up_data_structs::{71/* TODO free RMRK! use up_data_structs::{72 RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,72 RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,73 RmrkPartType, RmrkTheme,73 RmrkPartType, RmrkTheme,74};74};*/757576/// Unique native executor instance.76/// Unique native executor instance.77#[cfg(feature = "unique-runtime")]77#[cfg(feature = "unique-runtime")]353 + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>353 + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>354 + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>354 + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>355 + up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>355 + up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>356 + rmrk_rpc::RmrkApi<356 /* TODO free RMRK!357 Block,357 + rmrk_rpc::RmrkApi<358 AccountId,358 Block,359 RmrkCollectionInfo<AccountId>,359 AccountId,360 RmrkInstanceInfo<AccountId>,360 RmrkCollectionInfo<AccountId>,361 RmrkResourceInfo,361 RmrkInstanceInfo<AccountId>,362 RmrkPropertyInfo,362 RmrkResourceInfo,363 RmrkBaseInfo<AccountId>,363 RmrkPropertyInfo,364 RmrkPartType,364 RmrkBaseInfo<AccountId>,365 RmrkTheme,365 RmrkPartType,366 RmrkTheme,366 > + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>367 >*/ + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>367 + sp_api::Metadata<Block>368 + sp_api::Metadata<Block>368 + sp_offchain::OffchainWorkerApi<Block>369 + sp_offchain::OffchainWorkerApi<Block>369 + cumulus_primitives_core::CollectCollationInfo<Block>,370 + cumulus_primitives_core::CollectCollationInfo<Block>,644 + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>645 + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>645 + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>646 + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>646 + up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>647 + up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>647 + rmrk_rpc::RmrkApi<648 /* TODO free RMRK!648 Block,649 + rmrk_rpc::RmrkApi<649 AccountId,650 Block,650 RmrkCollectionInfo<AccountId>,651 AccountId,651 RmrkInstanceInfo<AccountId>,652 RmrkCollectionInfo<AccountId>,652 RmrkResourceInfo,653 RmrkInstanceInfo<AccountId>,653 RmrkPropertyInfo,654 RmrkResourceInfo,654 RmrkBaseInfo<AccountId>,655 RmrkPropertyInfo,655 RmrkPartType,656 RmrkBaseInfo<AccountId>,656 RmrkTheme,657 RmrkPartType,658 RmrkTheme,657 > + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>659 >*/ + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>658 + sp_api::Metadata<Block>660 + sp_api::Metadata<Block>659 + sp_offchain::OffchainWorkerApi<Block>661 + sp_offchain::OffchainWorkerApi<Block>660 + cumulus_primitives_core::CollectCollationInfo<Block>662 + cumulus_primitives_core::CollectCollationInfo<Block>787 + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>789 + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>788 + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>790 + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>789 + up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>791 + up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>790 + rmrk_rpc::RmrkApi<792 /* TODO free RMRK!791 Block,793 + rmrk_rpc::RmrkApi<792 AccountId,794 Block,793 RmrkCollectionInfo<AccountId>,795 AccountId,794 RmrkInstanceInfo<AccountId>,796 RmrkCollectionInfo<AccountId>,795 RmrkResourceInfo,797 RmrkInstanceInfo<AccountId>,796 RmrkPropertyInfo,798 RmrkResourceInfo,797 RmrkBaseInfo<AccountId>,799 RmrkPropertyInfo,798 RmrkPartType,800 RmrkBaseInfo<AccountId>,799 RmrkTheme,801 RmrkPartType,802 RmrkTheme,800 > + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>803 >*/ + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>801 + sp_api::Metadata<Block>804 + sp_api::Metadata<Block>802 + sp_offchain::OffchainWorkerApi<Block>805 + sp_offchain::OffchainWorkerApi<Block>803 + cumulus_primitives_core::CollectCollationInfo<Block>806 + cumulus_primitives_core::CollectCollationInfo<Block>node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -44,10 +44,10 @@
Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,
};
// RMRK
-use up_data_structs::{
+/* TODO free RMRK! use up_data_structs::{
RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,
RmrkPartType, RmrkTheme,
-};
+};*/
/// Public io handler for exporting into other modules
pub type IoHandler = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
@@ -149,6 +149,7 @@
C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,
C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,
C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,
+ /* TODO free RMRK!
C::Api: rmrk_rpc::RmrkApi<
Block,
AccountId,
@@ -159,7 +160,7 @@
RmrkBaseInfo<AccountId>,
RmrkPartType,
RmrkTheme,
- >,
+ >,*/
B: sc_client_api::Backend<Block> + Send + Sync + 'static,
B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,
P: TransactionPool<Block = Block> + 'static,
@@ -233,7 +234,7 @@
// todo look into
//let unique = Unique::new(client.clone());
io.extend_with(UniqueApi::to_delegate(Unique::new(client.clone())));
- io.extend_with(RmrkApi::to_delegate(Unique::new(client.clone())));
+ // TODO free RMRK! io.extend_with(RmrkApi::to_delegate(Unique::new(client.clone())));
if let Some(filter_pool) = filter_pool {
io.extend_with(EthFilterApiServer::to_delegate(EthFilterApi::new(
runtime/common/src/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/src/runtime_apis.rs
+++ b/runtime/common/src/runtime_apis.rs
@@ -126,6 +126,8 @@
}
}
+ /*
+ TODO free RMRK!
impl rmrk_rpc::RmrkApi<
Block,
AccountId,
@@ -459,7 +461,7 @@
Ok(Some(theme))
}
- }
+ }*/
impl sp_api::Core<Block> for Runtime {
fn version() -> RuntimeVersion {
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -903,13 +903,15 @@
type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;
}
+/*
+TODO free RMRK!
impl pallet_proxy_rmrk_core::Config for Runtime {
type Event = Event;
}
impl pallet_proxy_rmrk_equip::Config for Runtime {
type Event = Event;
-}
+}*/
impl pallet_unique::Config for Runtime {
type Event = Event;
@@ -1032,8 +1034,10 @@
Refungible: pallet_refungible::{Pallet, Storage} = 68,
Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,
Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,
+ /* TODO free RMRK!
RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,
RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,
+ */
// Frontier
EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -887,14 +887,14 @@
impl pallet_nonfungible::Config for Runtime {
type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;
}
-
+/* TODO free RMRK!
impl pallet_proxy_rmrk_core::Config for Runtime {
type Event = Event;
}
impl pallet_proxy_rmrk_equip::Config for Runtime {
type Event = Event;
-}
+}*/
impl pallet_unique::Config for Runtime {
type Event = Event;
@@ -1017,8 +1017,9 @@
Refungible: pallet_refungible::{Pallet, Storage} = 68,
Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,
Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,
+ /* TODO free RMRK!
RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,
- RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,
+ RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,*/
// Frontier
EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,
runtime/unique/src/lib.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -892,14 +892,14 @@
impl pallet_nonfungible::Config for Runtime {
type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;
}
-
+/* TODO free RMRK!
impl pallet_proxy_rmrk_core::Config for Runtime {
type Event = Event;
}
impl pallet_proxy_rmrk_equip::Config for Runtime {
type Event = Event;
-}
+}*/
impl pallet_unique::Config for Runtime {
type Event = Event;
@@ -1022,8 +1022,9 @@
Refungible: pallet_refungible::{Pallet, Storage} = 68,
Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,
Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,
+ /* TODO free RMRK!
RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,
- RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,
+ RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,*/
// Frontier
EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,