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.rsdiffbeforeafterboth--- a/runtime/common/mod.rs
+++ b/runtime/common/mod.rs
@@ -43,6 +43,8 @@
};
use common_types::{AccountId, BlockNumber};
+pub type CommonError = pallet_common::Error<Runtime>;
+
/// The address format for describing accounts.
pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
/// Block header type as expected by this runtime.
runtime/common/runtime_apis.rsdiffbeforeafterboth189 }189 }190 }190 }191191192 #[allow(unused_variables)]193 impl rmrk_rpc::RmrkApi<192 impl rmrk_rpc::RmrkApi<194 Block,193 Block,195 AccountId,194 AccountId,206 return pallet_proxy_rmrk_core::rpc::last_collection_idx::<Runtime>();205 return pallet_proxy_rmrk_core::rpc::last_collection_idx::<Runtime>();207206208 #[cfg(not(feature = "rmrk"))]207 #[cfg(not(feature = "rmrk"))]209 return Ok(Default::default());208 return Err(CommonError::UnsupportedRuntimeApi.into());210 }209 }211210211 #[allow(unused_variables)]212 fn collection_by_id(collection_id: RmrkCollectionId) -> Result<Option<RmrkCollectionInfo<AccountId>>, DispatchError> {212 fn collection_by_id(collection_id: RmrkCollectionId) -> Result<Option<RmrkCollectionInfo<AccountId>>, DispatchError> {213 #[cfg(feature = "rmrk")]213 #[cfg(feature = "rmrk")]214 return pallet_proxy_rmrk_core::rpc::collection_by_id::<Runtime>(collection_id);214 return pallet_proxy_rmrk_core::rpc::collection_by_id::<Runtime>(collection_id);215215216 #[cfg(not(feature = "rmrk"))]216 #[cfg(not(feature = "rmrk"))]217 return Ok(Default::default())217 return Err(CommonError::UnsupportedRuntimeApi.into());218 }218 }219219220 #[allow(unused_variables)]220 fn nft_by_id(collection_id: RmrkCollectionId, nft_by_id: RmrkNftId) -> Result<Option<RmrkInstanceInfo<AccountId>>, DispatchError> {221 fn nft_by_id(collection_id: RmrkCollectionId, nft_by_id: RmrkNftId) -> Result<Option<RmrkInstanceInfo<AccountId>>, DispatchError> {221 #[cfg(feature = "rmrk")]222 #[cfg(feature = "rmrk")]222 return pallet_proxy_rmrk_core::rpc::nft_by_id::<Runtime>(collection_id, nft_by_id);223 return pallet_proxy_rmrk_core::rpc::nft_by_id::<Runtime>(collection_id, nft_by_id);223224224 #[cfg(not(feature = "rmrk"))]225 #[cfg(not(feature = "rmrk"))]225 return Ok(Default::default())226 return Err(CommonError::UnsupportedRuntimeApi.into());226 }227 }227228229 #[allow(unused_variables)]228 fn account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Result<Vec<RmrkNftId>, DispatchError> {230 fn account_tokens(account_id: AccountId, collection_id: RmrkCollectionId) -> Result<Vec<RmrkNftId>, DispatchError> {229 #[cfg(feature = "rmrk")]231 #[cfg(feature = "rmrk")]230 return pallet_proxy_rmrk_core::rpc::account_tokens::<Runtime>(account_id, collection_id);232 return pallet_proxy_rmrk_core::rpc::account_tokens::<Runtime>(account_id, collection_id);231233232 #[cfg(not(feature = "rmrk"))]234 #[cfg(not(feature = "rmrk"))]233 return Ok(Default::default())235 return Err(CommonError::UnsupportedRuntimeApi.into());234 }236 }235237238 #[allow(unused_variables)]236 fn nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Result<Vec<RmrkNftChild>, DispatchError> {239 fn nft_children(collection_id: RmrkCollectionId, nft_id: RmrkNftId) -> Result<Vec<RmrkNftChild>, DispatchError> {237 #[cfg(feature = "rmrk")]240 #[cfg(feature = "rmrk")]238 return pallet_proxy_rmrk_core::rpc::nft_children::<Runtime>(collection_id, nft_id);241 return pallet_proxy_rmrk_core::rpc::nft_children::<Runtime>(collection_id, nft_id);239242240 #[cfg(not(feature = "rmrk"))]243 #[cfg(not(feature = "rmrk"))]241 return Ok(Default::default())244 return Err(CommonError::UnsupportedRuntimeApi.into());242 }245 }243246247 #[allow(unused_variables)]244 fn collection_properties(248 fn collection_properties(245 collection_id: RmrkCollectionId,249 collection_id: RmrkCollectionId,246 filter_keys: Option<Vec<RmrkPropertyKey>>250 filter_keys: Option<Vec<RmrkPropertyKey>>249 return pallet_proxy_rmrk_core::rpc::collection_properties::<Runtime>(collection_id, filter_keys);253 return pallet_proxy_rmrk_core::rpc::collection_properties::<Runtime>(collection_id, filter_keys);250254251 #[cfg(not(feature = "rmrk"))]255 #[cfg(not(feature = "rmrk"))]252 return Ok(Default::default())256 return Err(CommonError::UnsupportedRuntimeApi.into());253 }257 }254258259 #[allow(unused_variables)]255 fn nft_properties(260 fn nft_properties(256 collection_id: RmrkCollectionId,261 collection_id: RmrkCollectionId,257 nft_id: RmrkNftId,262 nft_id: RmrkNftId,261 return pallet_proxy_rmrk_core::rpc::nft_properties::<Runtime>(collection_id, nft_id, filter_keys);266 return pallet_proxy_rmrk_core::rpc::nft_properties::<Runtime>(collection_id, nft_id, filter_keys);262267263 #[cfg(not(feature = "rmrk"))]268 #[cfg(not(feature = "rmrk"))]264 return Ok(Default::default())269 return Err(CommonError::UnsupportedRuntimeApi.into());265 }270 }266271272 #[allow(unused_variables)]267 fn nft_resources(collection_id: RmrkCollectionId,nft_id: RmrkNftId) -> Result<Vec<RmrkResourceInfo>, DispatchError> {273 fn nft_resources(collection_id: RmrkCollectionId,nft_id: RmrkNftId) -> Result<Vec<RmrkResourceInfo>, DispatchError> {268 #[cfg(feature = "rmrk")]274 #[cfg(feature = "rmrk")]269 return pallet_proxy_rmrk_core::rpc::nft_resources::<Runtime>(collection_id, nft_id);275 return pallet_proxy_rmrk_core::rpc::nft_resources::<Runtime>(collection_id, nft_id);270276271 #[cfg(not(feature = "rmrk"))]277 #[cfg(not(feature = "rmrk"))]272 return Ok(Default::default())278 return Err(CommonError::UnsupportedRuntimeApi.into());273 }279 }274280281 #[allow(unused_variables)]275 fn nft_resource_priority(282 fn nft_resource_priority(276 collection_id: RmrkCollectionId,283 collection_id: RmrkCollectionId,277 nft_id: RmrkNftId,284 nft_id: RmrkNftId,281 return pallet_proxy_rmrk_core::rpc::nft_resource_priority::<Runtime>(collection_id, nft_id, resource_id);288 return pallet_proxy_rmrk_core::rpc::nft_resource_priority::<Runtime>(collection_id, nft_id, resource_id);282289283 #[cfg(not(feature = "rmrk"))]290 #[cfg(not(feature = "rmrk"))]284 return Ok(Default::default())291 return Err(CommonError::UnsupportedRuntimeApi.into());285 }292 }286293294 #[allow(unused_variables)]287 fn base(base_id: RmrkBaseId) -> Result<Option<RmrkBaseInfo<AccountId>>, DispatchError> {295 fn base(base_id: RmrkBaseId) -> Result<Option<RmrkBaseInfo<AccountId>>, DispatchError> {288 #[cfg(feature = "rmrk")]296 #[cfg(feature = "rmrk")]289 return pallet_proxy_rmrk_equip::rpc::base::<Runtime>(base_id);297 return pallet_proxy_rmrk_equip::rpc::base::<Runtime>(base_id);290298291 #[cfg(not(feature = "rmrk"))]299 #[cfg(not(feature = "rmrk"))]292 return Ok(Default::default())300 return Err(CommonError::UnsupportedRuntimeApi.into());293 }301 }294302303 #[allow(unused_variables)]295 fn base_parts(base_id: RmrkBaseId) -> Result<Vec<RmrkPartType>, DispatchError> {304 fn base_parts(base_id: RmrkBaseId) -> Result<Vec<RmrkPartType>, DispatchError> {296 #[cfg(feature = "rmrk")]305 #[cfg(feature = "rmrk")]297 return pallet_proxy_rmrk_equip::rpc::base_parts::<Runtime>(base_id);306 return pallet_proxy_rmrk_equip::rpc::base_parts::<Runtime>(base_id);298307299 #[cfg(not(feature = "rmrk"))]308 #[cfg(not(feature = "rmrk"))]300 return Ok(Default::default())309 return Err(CommonError::UnsupportedRuntimeApi.into());301 }310 }302311312 #[allow(unused_variables)]303 fn theme_names(base_id: RmrkBaseId) -> Result<Vec<RmrkThemeName>, DispatchError> {313 fn theme_names(base_id: RmrkBaseId) -> Result<Vec<RmrkThemeName>, DispatchError> {304 #[cfg(feature = "rmrk")]314 #[cfg(feature = "rmrk")]305 return pallet_proxy_rmrk_equip::rpc::theme_names::<Runtime>(base_id);315 return pallet_proxy_rmrk_equip::rpc::theme_names::<Runtime>(base_id);306316307 #[cfg(not(feature = "rmrk"))]317 #[cfg(not(feature = "rmrk"))]308 Ok(Default::default())318 return Err(CommonError::UnsupportedRuntimeApi.into());309 }319 }310320321 #[allow(unused_variables)]311 fn theme(322 fn theme(312 base_id: RmrkBaseId,323 base_id: RmrkBaseId,313 theme_name: RmrkThemeName,324 theme_name: RmrkThemeName,317 return pallet_proxy_rmrk_equip::rpc::theme::<Runtime>(base_id, theme_name, filter_keys);328 return pallet_proxy_rmrk_equip::rpc::theme::<Runtime>(base_id, theme_name, filter_keys);318329319 #[cfg(not(feature = "rmrk"))]330 #[cfg(not(feature = "rmrk"))]320 return Ok(Default::default())331 return Err(CommonError::UnsupportedRuntimeApi.into());321 }332 }322 }333 }323334