git.delta.rocks / unique-network / refs/commits / 41b30206b8b0

difftreelog

build remove RMRK usage

Fahrrader2022-05-27parent: #7f246e9.patch.diff
in: master

6 files changed

modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -68,10 +68,10 @@
 use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block};
 
 // RMRK
-use up_data_structs::{
+/* TODO free RMRK! use up_data_structs::{
 	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,
 	RmrkPartType, RmrkTheme,
-};
+};*/
 
 /// Unique native executor instance.
 #[cfg(feature = "unique-runtime")]
@@ -353,6 +353,7 @@
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
 		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>
 		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>
+		/* TODO free RMRK!
 		+ rmrk_rpc::RmrkApi<
 			Block,
 			AccountId,
@@ -363,7 +364,7 @@
 			RmrkBaseInfo<AccountId>,
 			RmrkPartType,
 			RmrkTheme,
-		> + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
+		>*/ + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
 		+ sp_api::Metadata<Block>
 		+ sp_offchain::OffchainWorkerApi<Block>
 		+ cumulus_primitives_core::CollectCollationInfo<Block>,
@@ -644,6 +645,7 @@
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
 		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>
 		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>
+		/* TODO free RMRK!
 		+ rmrk_rpc::RmrkApi<
 			Block,
 			AccountId,
@@ -654,7 +656,7 @@
 			RmrkBaseInfo<AccountId>,
 			RmrkPartType,
 			RmrkTheme,
-		> + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
+		>*/ + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
 		+ sp_api::Metadata<Block>
 		+ sp_offchain::OffchainWorkerApi<Block>
 		+ cumulus_primitives_core::CollectCollationInfo<Block>
@@ -787,6 +789,7 @@
 		+ pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>
 		+ sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>
 		+ up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>
+		/* TODO free RMRK!
 		+ rmrk_rpc::RmrkApi<
 			Block,
 			AccountId,
@@ -797,7 +800,7 @@
 			RmrkBaseInfo<AccountId>,
 			RmrkPartType,
 			RmrkTheme,
-		> + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
+		>*/ + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
 		+ sp_api::Metadata<Block>
 		+ sp_offchain::OffchainWorkerApi<Block>
 		+ cumulus_primitives_core::CollectCollationInfo<Block>
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
44	Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,44	Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,
45};45};
46// RMRK46// RMRK
47use up_data_structs::{47/* TODO free RMRK! use up_data_structs::{
48	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,48	RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,
49	RmrkPartType, RmrkTheme,49	RmrkPartType, RmrkTheme,
50};50};*/
5151
52/// Public io handler for exporting into other modules52/// Public io handler for exporting into other modules
53pub type IoHandler = jsonrpc_core::IoHandler<sc_rpc::Metadata>;53pub type IoHandler = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
149	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,149	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,
150	C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,150	C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,
151	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,151	C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,
152	C::Api: rmrk_rpc::RmrkApi<152	/* TODO free RMRK!
153		Block,153	C::Api: rmrk_rpc::RmrkApi<
154		AccountId,154		Block,
155		RmrkCollectionInfo<AccountId>,155		AccountId,
156		RmrkInstanceInfo<AccountId>,156		RmrkCollectionInfo<AccountId>,
157		RmrkResourceInfo,157		RmrkInstanceInfo<AccountId>,
158		RmrkPropertyInfo,158		RmrkResourceInfo,
159		RmrkBaseInfo<AccountId>,159		RmrkPropertyInfo,
160		RmrkPartType,160		RmrkBaseInfo<AccountId>,
161		RmrkTheme,161		RmrkPartType,
162	>,162		RmrkTheme,
163	>,*/
163	B: sc_client_api::Backend<Block> + Send + Sync + 'static,164	B: sc_client_api::Backend<Block> + Send + Sync + 'static,
164	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,165	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,
165	P: TransactionPool<Block = Block> + 'static,166	P: TransactionPool<Block = Block> + 'static,
233	// todo look into234	// todo look into
234	//let unique = Unique::new(client.clone());235	//let unique = Unique::new(client.clone());
235	io.extend_with(UniqueApi::to_delegate(Unique::new(client.clone())));236	io.extend_with(UniqueApi::to_delegate(Unique::new(client.clone())));
236	io.extend_with(RmrkApi::to_delegate(Unique::new(client.clone())));237	// TODO free RMRK! io.extend_with(RmrkApi::to_delegate(Unique::new(client.clone())));
237238
238	if let Some(filter_pool) = filter_pool {239	if let Some(filter_pool) = filter_pool {
239		io.extend_with(EthFilterApiServer::to_delegate(EthFilterApi::new(240		io.extend_with(EthFilterApiServer::to_delegate(EthFilterApi::new(
modifiedruntime/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 {
modifiedruntime/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,
modifiedruntime/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,
modifiedruntime/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,