difftreelog
fix use errors in unsupported runtime APIs
in: master
3 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -569,6 +569,9 @@
/// Tried to access an internal collection with an external API
CollectionIsInternal,
+
+ /// A method of an unsupported API was called
+ UnsupportedRuntimeApi,
}
/// Storage of the count of created collections. Essentially contains the last collection ID.
runtime/common/mod.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617pub mod constants;18pub mod construct_runtime;19pub mod dispatch;20pub mod runtime_apis;21pub mod sponsoring;22pub mod weights;23pub mod config;24pub mod instance;25pub mod ethereum;26pub mod scheduler;2728use sp_core::H160;29use frame_support::traits::{Currency, OnUnbalanced, Imbalance};30use sp_runtime::{31 generic,32 traits::{BlakeTwo256, BlockNumberProvider},33 impl_opaque_keys,34};35use sp_std::vec::Vec;3637#[cfg(feature = "std")]38use sp_version::NativeVersion;3940use crate::{41 Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,42 InherentDataExt,43};44use common_types::{AccountId, BlockNumber};4546/// The address format for describing accounts.47pub type Address = sp_runtime::MultiAddress<AccountId, ()>;48/// Block header type as expected by this runtime.49pub type Header = generic::Header<BlockNumber, BlakeTwo256>;50/// Block type as expected by this runtime.51pub type Block = generic::Block<Header, UncheckedExtrinsic>;52/// A Block signed with a Justification53pub type SignedBlock = generic::SignedBlock<Block>;54/// BlockId type as expected by this runtime.55pub type BlockId = generic::BlockId<Block>;5657impl_opaque_keys! {58 pub struct SessionKeys {59 pub aura: Aura,60 }61}6263/// The version information used to identify this runtime when compiled natively.64#[cfg(feature = "std")]65pub fn native_version() -> NativeVersion {66 NativeVersion {67 runtime_version: crate::VERSION,68 can_author_with: Default::default(),69 }70}7172pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;7374pub type SignedExtra = (75 frame_system::CheckSpecVersion<Runtime>,76 // system::CheckTxVersion<Runtime>,77 frame_system::CheckGenesis<Runtime>,78 frame_system::CheckEra<Runtime>,79 frame_system::CheckNonce<Runtime>,80 frame_system::CheckWeight<Runtime>,81 ChargeTransactionPayment,82 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,83 pallet_ethereum::FakeTransactionFinalizer<Runtime>,84);8586/// Unchecked extrinsic type as expected by this runtime.87pub type UncheckedExtrinsic =88 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;8990/// Extrinsic type that has already been checked.91pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;9293/// Executive: handles dispatch to the various modules.94pub type Executive = frame_executive::Executive<95 Runtime,96 Block,97 frame_system::ChainContext<Runtime>,98 Runtime,99 AllPalletsReversedWithSystemFirst,100>;101102type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;103104pub struct DealWithFees;105impl OnUnbalanced<NegativeImbalance> for DealWithFees {106 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {107 if let Some(fees) = fees_then_tips.next() {108 // for fees, 100% to treasury109 let mut split = fees.ration(100, 0);110 if let Some(tips) = fees_then_tips.next() {111 // for tips, if any, 100% to treasury112 tips.ration_merge_into(100, 0, &mut split);113 }114 Treasury::on_unbalanced(split.0);115 // Author::on_unbalanced(split.1);116 }117 }118}119120pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);121122impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider123 for RelayChainBlockNumberProvider<T>124{125 type BlockNumber = BlockNumber;126127 fn current_block_number() -> Self::BlockNumber {128 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()129 .map(|d| d.relay_parent_number)130 .unwrap_or_default()131 }132}133134pub(crate) struct CheckInherents;135136impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {137 fn check_inherents(138 block: &Block,139 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,140 ) -> sp_inherents::CheckInherentsResult {141 let relay_chain_slot = relay_state_proof142 .read_slot()143 .expect("Could not read the relay chain slot from the proof");144145 let inherent_data =146 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(147 relay_chain_slot,148 sp_std::time::Duration::from_secs(6),149 )150 .create_inherent_data()151 .expect("Could not create the timestamp inherent data");152153 inherent_data.check_extrinsics(block)154 }155}156157#[derive(codec::Encode, codec::Decode)]158pub enum XCMPMessage<XAccountId, XBalance> {159 /// Transfer tokens to the given account from the Parachain account.160 TransferToken(XAccountId, XBalance),161}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617pub mod constants;18pub mod construct_runtime;19pub mod dispatch;20pub mod runtime_apis;21pub mod sponsoring;22pub mod weights;23pub mod config;24pub mod instance;25pub mod ethereum;26pub mod scheduler;2728use sp_core::H160;29use frame_support::traits::{Currency, OnUnbalanced, Imbalance};30use sp_runtime::{31 generic,32 traits::{BlakeTwo256, BlockNumberProvider},33 impl_opaque_keys,34};35use sp_std::vec::Vec;3637#[cfg(feature = "std")]38use sp_version::NativeVersion;3940use crate::{41 Runtime, Call, Balances, Treasury, Aura, Signature, AllPalletsReversedWithSystemFirst,42 InherentDataExt,43};44use common_types::{AccountId, BlockNumber};4546pub type CommonError = pallet_common::Error<Runtime>;4748/// The address format for describing accounts.49pub type Address = sp_runtime::MultiAddress<AccountId, ()>;50/// Block header type as expected by this runtime.51pub type Header = generic::Header<BlockNumber, BlakeTwo256>;52/// Block type as expected by this runtime.53pub type Block = generic::Block<Header, UncheckedExtrinsic>;54/// A Block signed with a Justification55pub type SignedBlock = generic::SignedBlock<Block>;56/// BlockId type as expected by this runtime.57pub type BlockId = generic::BlockId<Block>;5859impl_opaque_keys! {60 pub struct SessionKeys {61 pub aura: Aura,62 }63}6465/// The version information used to identify this runtime when compiled natively.66#[cfg(feature = "std")]67pub fn native_version() -> NativeVersion {68 NativeVersion {69 runtime_version: crate::VERSION,70 can_author_with: Default::default(),71 }72}7374pub type ChargeTransactionPayment = pallet_charge_transaction::ChargeTransactionPayment<Runtime>;7576pub type SignedExtra = (77 frame_system::CheckSpecVersion<Runtime>,78 // system::CheckTxVersion<Runtime>,79 frame_system::CheckGenesis<Runtime>,80 frame_system::CheckEra<Runtime>,81 frame_system::CheckNonce<Runtime>,82 frame_system::CheckWeight<Runtime>,83 ChargeTransactionPayment,84 //pallet_contract_helpers::ContractHelpersExtension<Runtime>,85 pallet_ethereum::FakeTransactionFinalizer<Runtime>,86);8788/// Unchecked extrinsic type as expected by this runtime.89pub type UncheckedExtrinsic =90 fp_self_contained::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;9192/// Extrinsic type that has already been checked.93pub type CheckedExtrinsic = fp_self_contained::CheckedExtrinsic<AccountId, Call, SignedExtra, H160>;9495/// Executive: handles dispatch to the various modules.96pub type Executive = frame_executive::Executive<97 Runtime,98 Block,99 frame_system::ChainContext<Runtime>,100 Runtime,101 AllPalletsReversedWithSystemFirst,102>;103104type NegativeImbalance = <Balances as Currency<AccountId>>::NegativeImbalance;105106pub struct DealWithFees;107impl OnUnbalanced<NegativeImbalance> for DealWithFees {108 fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance>) {109 if let Some(fees) = fees_then_tips.next() {110 // for fees, 100% to treasury111 let mut split = fees.ration(100, 0);112 if let Some(tips) = fees_then_tips.next() {113 // for tips, if any, 100% to treasury114 tips.ration_merge_into(100, 0, &mut split);115 }116 Treasury::on_unbalanced(split.0);117 // Author::on_unbalanced(split.1);118 }119 }120}121122pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);123124impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider125 for RelayChainBlockNumberProvider<T>126{127 type BlockNumber = BlockNumber;128129 fn current_block_number() -> Self::BlockNumber {130 cumulus_pallet_parachain_system::Pallet::<T>::validation_data()131 .map(|d| d.relay_parent_number)132 .unwrap_or_default()133 }134}135136pub(crate) struct CheckInherents;137138impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {139 fn check_inherents(140 block: &Block,141 relay_state_proof: &cumulus_pallet_parachain_system::RelayChainStateProof,142 ) -> sp_inherents::CheckInherentsResult {143 let relay_chain_slot = relay_state_proof144 .read_slot()145 .expect("Could not read the relay chain slot from the proof");146147 let inherent_data =148 cumulus_primitives_timestamp::InherentDataProvider::from_relay_chain_slot_and_duration(149 relay_chain_slot,150 sp_std::time::Duration::from_secs(6),151 )152 .create_inherent_data()153 .expect("Could not create the timestamp inherent data");154155 inherent_data.check_extrinsics(block)156 }157}158159#[derive(codec::Encode, codec::Decode)]160pub enum XCMPMessage<XAccountId, XBalance> {161 /// Transfer tokens to the given account from the Parachain account.162 TransferToken(XAccountId, XBalance),163}runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -189,7 +189,6 @@
}
}
- #[allow(unused_variables)]
impl rmrk_rpc::RmrkApi<
Block,
AccountId,
@@ -206,41 +205,46 @@
return pallet_proxy_rmrk_core::rpc::last_collection_idx::<Runtime>();
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default());
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn collection_by_id(collection_id: RmrkCollectionId) -> Result<Option<RmrkCollectionInfo<AccountId>>, DispatchError> {
#[cfg(feature = "rmrk")]
return pallet_proxy_rmrk_core::rpc::collection_by_id::<Runtime>(collection_id);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn nft_by_id(collection_id: RmrkCollectionId, nft_by_id: RmrkNftId) -> Result<Option<RmrkInstanceInfo<AccountId>>, DispatchError> {
#[cfg(feature = "rmrk")]
return pallet_proxy_rmrk_core::rpc::nft_by_id::<Runtime>(collection_id, nft_by_id);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Result<Vec<RmrkNftId>, DispatchError> {
#[cfg(feature = "rmrk")]
return pallet_proxy_rmrk_core::rpc::account_tokens::<Runtime>(account_id, collection_id);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Result<Vec<RmrkNftChild>, DispatchError> {
#[cfg(feature = "rmrk")]
return pallet_proxy_rmrk_core::rpc::nft_children::<Runtime>(collection_id, nft_id);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn collection_properties(
collection_id: RmrkCollectionId,
filter_keys: Option<Vec<RmrkPropertyKey>>
@@ -249,9 +253,10 @@
return pallet_proxy_rmrk_core::rpc::collection_properties::<Runtime>(collection_id, filter_keys);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn nft_properties(
collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
@@ -261,17 +266,19 @@
return pallet_proxy_rmrk_core::rpc::nft_properties::<Runtime>(collection_id, nft_id, filter_keys);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn nft_resources(collection_id: RmrkCollectionId,nft_id: RmrkNftId) -> Result<Vec<RmrkResourceInfo>, DispatchError> {
#[cfg(feature = "rmrk")]
return pallet_proxy_rmrk_core::rpc::nft_resources::<Runtime>(collection_id, nft_id);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn nft_resource_priority(
collection_id: RmrkCollectionId,
nft_id: RmrkNftId,
@@ -281,33 +288,37 @@
return pallet_proxy_rmrk_core::rpc::nft_resource_priority::<Runtime>(collection_id, nft_id, resource_id);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn base(base_id: RmrkBaseId) -> Result<Option<RmrkBaseInfo<AccountId>>, DispatchError> {
#[cfg(feature = "rmrk")]
return pallet_proxy_rmrk_equip::rpc::base::<Runtime>(base_id);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn base_parts(base_id: RmrkBaseId) -> Result<Vec<RmrkPartType>, DispatchError> {
#[cfg(feature = "rmrk")]
return pallet_proxy_rmrk_equip::rpc::base_parts::<Runtime>(base_id);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn theme_names(base_id: RmrkBaseId) -> Result<Vec<RmrkThemeName>, DispatchError> {
#[cfg(feature = "rmrk")]
return pallet_proxy_rmrk_equip::rpc::theme_names::<Runtime>(base_id);
#[cfg(not(feature = "rmrk"))]
- Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
+ #[allow(unused_variables)]
fn theme(
base_id: RmrkBaseId,
theme_name: RmrkThemeName,
@@ -317,7 +328,7 @@
return pallet_proxy_rmrk_equip::rpc::theme::<Runtime>(base_id, theme_name, filter_keys);
#[cfg(not(feature = "rmrk"))]
- return Ok(Default::default())
+ return Err(CommonError::UnsupportedRuntimeApi.into());
}
}