difftreelog
refactor unsupported! macro
in: master
4 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -535,7 +535,8 @@
/// Can't transfer tokens to ethereum zero address
AddressIsZero,
- /// Target collection doesn't support this operation
+
+ /// The oprtation is not supported
UnsupportedOperation,
/// Insufficient funds to perform an action
@@ -569,9 +570,6 @@
/// 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.
@@ -1356,8 +1354,8 @@
/// Indicates unsupported methods by returning [Error::UnsupportedOperation].
#[macro_export]
macro_rules! unsupported {
- () => {
- Err(<Error<T>>::UnsupportedOperation.into())
+ ($runtime:path) => {
+ Err($crate::Error::<$runtime>::UnsupportedOperation.into())
};
}
runtime/common/dispatch.rsdiffbeforeafterboth--- a/runtime/common/dispatch.rs
+++ b/runtime/common/dispatch.rs
@@ -34,6 +34,9 @@
CollectionId,
};
+#[cfg(not(feature = "refungible"))]
+use pallet_common::unsupported;
+
pub enum CollectionDispatchT<T>
where
T: pallet_fungible::Config + pallet_nonfungible::Config + pallet_refungible::Config,
@@ -64,13 +67,12 @@
);
<PalletFungible<T>>::init_collection(sender, data)?
}
+
#[cfg(feature = "refungible")]
CollectionMode::ReFungible => <PalletRefungible<T>>::init_collection(sender, data)?,
#[cfg(not(feature = "refungible"))]
- CollectionMode::ReFungible => {
- return Err(DispatchError::Other("Refunginle pallet is not supported"))
- }
+ CollectionMode::ReFungible => return unsupported!(T)
};
Ok(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 config;18pub mod constants;19pub mod construct_runtime;20pub mod dispatch;21pub mod ethereum;22pub mod instance;23pub mod runtime_apis;24pub mod scheduler;25pub mod sponsoring;26pub mod weights;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
@@ -205,7 +205,7 @@
return pallet_proxy_rmrk_core::rpc::last_collection_idx::<Runtime>();
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -214,7 +214,7 @@
return pallet_proxy_rmrk_core::rpc::collection_by_id::<Runtime>(collection_id);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -223,7 +223,7 @@
return pallet_proxy_rmrk_core::rpc::nft_by_id::<Runtime>(collection_id, nft_by_id);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -232,7 +232,7 @@
return pallet_proxy_rmrk_core::rpc::account_tokens::<Runtime>(account_id, collection_id);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -241,7 +241,7 @@
return pallet_proxy_rmrk_core::rpc::nft_children::<Runtime>(collection_id, nft_id);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -253,7 +253,7 @@
return pallet_proxy_rmrk_core::rpc::collection_properties::<Runtime>(collection_id, filter_keys);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -266,7 +266,7 @@
return pallet_proxy_rmrk_core::rpc::nft_properties::<Runtime>(collection_id, nft_id, filter_keys);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -275,7 +275,7 @@
return pallet_proxy_rmrk_core::rpc::nft_resources::<Runtime>(collection_id, nft_id);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -288,7 +288,7 @@
return pallet_proxy_rmrk_core::rpc::nft_resource_priority::<Runtime>(collection_id, nft_id, resource_id);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -297,7 +297,7 @@
return pallet_proxy_rmrk_equip::rpc::base::<Runtime>(base_id);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -306,7 +306,7 @@
return pallet_proxy_rmrk_equip::rpc::base_parts::<Runtime>(base_id);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -315,7 +315,7 @@
return pallet_proxy_rmrk_equip::rpc::theme_names::<Runtime>(base_id);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
#[allow(unused_variables)]
@@ -328,7 +328,7 @@
return pallet_proxy_rmrk_equip::rpc::theme::<Runtime>(base_id, theme_name, filter_keys);
#[cfg(not(feature = "rmrk"))]
- return Err(CommonError::UnsupportedRuntimeApi.into());
+ return unsupported!();
}
}