mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-21 02:51:02 +00:00
Emit error when construct_runtime imports a non-existent pallet part (#8949)
* Emit error when construct_runtime imports a non-existent Call part * Reword and display pallet name when emitting part not found error * Migrate decl_outer_dispatch to a proc macro * Rename calls.rs to call.rs * Create new construct_runtime_v2 macro * Add UI test for importing non-existent call part in construct_runtime * Emit error when construct_runtime imports a non-existent Config part * Emit error when construct_runtime imports a non-existent Event part * Migrate decl_outer_inherent to a proc macro * Emit error when construct_runtime imports a non-existent Inherent part * Migrate decl_outer_validate_unsigned to a proc macro * Emit error when construct_runtime imports a non-existent ValidateUnsigned part * impl for old macro * fix line width * add doc * hide macroes and use unique counter everywhere * Remove construct_runtime_v2 * Encapsulate pallet part check macros in a module * Fix macro definitions in dummy part checker * Tag ProvideInherent impl with #[pallet::inherent] properly for authorship pallet * Remove Call part from pallets that do not define it * Add Call part unit tests * Remove undefined Call part import from offences pallet * Add tests for expand_outer_inherent * Remove Call part from pallets that do not define them * Remove Call part imports from pallets that do not have it defined * Remove Call part import of the offences pallet from grandpa pallet mocks * Update frame/support/test/tests/pallet.rs Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> * Remove Call part imports for pallets that do not define them * Move inherent tests to inherent_expand * Add unit tests for expand_outer_validate_unsigned * Add newline at the end of file * fix ui test * Small prayer to RNGsus for fixing CI * Remove Call part from construct_runtime for randomness collective flip pallet * Remove Call part import for randomness collective flip pallet * Summon Laplace's demon instead of praying to RNGsus * Update test expectations * fix ui test and make sure it's flaky * Revert "fix ui test and make sure it's flaky" This reverts commit 362b6881389c911ef8d9ef85d71c9463f5694b20. * Comment out test instead of putting it in conditional compilation * Update UI test expectations * Update UI test expectations * Emit error when construct_runtime imports a non-existent Origin part Co-authored-by: thiolliere <gui.thiolliere@gmail.com> Co-authored-by: Denis P <denis.pisarev@parity.io>
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
|
||||
use crate::pallet::Def;
|
||||
use frame_support_procedural_tools::clean_type_string;
|
||||
use crate::COUNTER;
|
||||
use syn::spanned::Spanned;
|
||||
|
||||
/// * Generate enum call and implement various trait on it.
|
||||
@@ -31,7 +32,7 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
|
||||
|
||||
(span, where_clause, methods, docs)
|
||||
}
|
||||
None => (def.pallet_struct.attr_span, None, Vec::new(), Vec::new()),
|
||||
None => (def.item.span(), None, Vec::new(), Vec::new()),
|
||||
};
|
||||
let frame_support = &def.frame_support;
|
||||
let frame_system = &def.frame_system;
|
||||
@@ -89,7 +90,37 @@ pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
|
||||
&docs[..]
|
||||
};
|
||||
|
||||
let maybe_compile_error = if def.call.is_none() {
|
||||
quote::quote!{
|
||||
compile_error!(concat!(
|
||||
"`",
|
||||
stringify!($pallet_name),
|
||||
"` does not have #[pallet::call] defined, perhaps you should remove `Call` from \
|
||||
construct_runtime?",
|
||||
));
|
||||
}
|
||||
} else {
|
||||
proc_macro2::TokenStream::new()
|
||||
};
|
||||
|
||||
let count = COUNTER.with(|counter| counter.borrow_mut().inc());
|
||||
let macro_ident = syn::Ident::new(&format!("__is_call_part_defined_{}", count), span);
|
||||
|
||||
quote::quote_spanned!(span =>
|
||||
#[doc(hidden)]
|
||||
pub mod __substrate_call_check {
|
||||
#[macro_export]
|
||||
#[doc(hidden)]
|
||||
macro_rules! #macro_ident {
|
||||
($pallet_name:ident) => {
|
||||
#maybe_compile_error
|
||||
};
|
||||
}
|
||||
|
||||
#[doc(hidden)]
|
||||
pub use #macro_ident as is_call_part_defined;
|
||||
}
|
||||
|
||||
#( #[doc = #docs] )*
|
||||
#[derive(
|
||||
#frame_support::RuntimeDebugNoBound,
|
||||
|
||||
@@ -16,15 +16,44 @@
|
||||
// limitations under the License.
|
||||
|
||||
use crate::pallet::{Def, parse::helper::get_doc_literals};
|
||||
use crate::COUNTER;
|
||||
use syn::{spanned::Spanned, Ident};
|
||||
|
||||
/// * Add __Ignore variant on Event
|
||||
/// * Impl various trait on Event including metadata
|
||||
/// * if deposit_event is defined, implement deposit_event on module.
|
||||
pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
|
||||
let event = if let Some(event) = &def.event {
|
||||
event
|
||||
let count = COUNTER.with(|counter| counter.borrow_mut().inc());
|
||||
|
||||
let (event, macro_ident) = if let Some(event) = &def.event {
|
||||
let ident = Ident::new(&format!("__is_event_part_defined_{}", count), event.attr_span);
|
||||
(event, ident)
|
||||
} else {
|
||||
return Default::default()
|
||||
let macro_ident = Ident::new(
|
||||
&format!("__is_event_part_defined_{}", count),
|
||||
def.item.span(),
|
||||
);
|
||||
|
||||
return quote::quote! {
|
||||
#[doc(hidden)]
|
||||
pub mod __substrate_event_check {
|
||||
#[macro_export]
|
||||
#[doc(hidden)]
|
||||
macro_rules! #macro_ident {
|
||||
($pallet_name:ident) => {
|
||||
compile_error!(concat!(
|
||||
"`",
|
||||
stringify!($pallet_name),
|
||||
"` does not have #[pallet::event] defined, perhaps you should \
|
||||
remove `Event` from construct_runtime?",
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
#[doc(hidden)]
|
||||
pub use #macro_ident as is_event_part_defined;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
let event_where_clause = &event.where_clause;
|
||||
@@ -130,6 +159,18 @@ pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
|
||||
};
|
||||
|
||||
quote::quote_spanned!(event.attr_span =>
|
||||
#[doc(hidden)]
|
||||
pub mod __substrate_event_check {
|
||||
#[macro_export]
|
||||
#[doc(hidden)]
|
||||
macro_rules! #macro_ident {
|
||||
($pallet_name:ident) => {};
|
||||
}
|
||||
|
||||
#[doc(hidden)]
|
||||
pub use #macro_ident as is_event_part_defined;
|
||||
}
|
||||
|
||||
#deposit_event
|
||||
|
||||
impl<#event_impl_gen> From<#event_ident<#event_use_gen>> for () #event_where_clause {
|
||||
|
||||
@@ -16,13 +16,45 @@
|
||||
// limitations under the License.
|
||||
|
||||
use crate::pallet::{Def, parse::helper::get_doc_literals};
|
||||
use crate::COUNTER;
|
||||
use syn::{Ident, spanned::Spanned};
|
||||
|
||||
/// * add various derive trait on GenesisConfig struct.
|
||||
pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
|
||||
let genesis_config = if let Some(genesis_config) = &def.genesis_config {
|
||||
genesis_config
|
||||
let count = COUNTER.with(|counter| counter.borrow_mut().inc());
|
||||
|
||||
let (genesis_config, macro_ident) = if let Some(genesis_config) = &def.genesis_config {
|
||||
let ident = Ident::new(
|
||||
&format!("__is_genesis_config_defined_{}", count),
|
||||
genesis_config.genesis_config.span(),
|
||||
);
|
||||
(genesis_config, ident)
|
||||
} else {
|
||||
return Default::default()
|
||||
let macro_ident = Ident::new(
|
||||
&format!("__is_genesis_config_defined_{}", count),
|
||||
def.item.span(),
|
||||
);
|
||||
|
||||
return quote::quote! {
|
||||
#[doc(hidden)]
|
||||
pub mod __substrate_genesis_config_check {
|
||||
#[macro_export]
|
||||
#[doc(hidden)]
|
||||
macro_rules! #macro_ident {
|
||||
($pallet_name:ident) => {
|
||||
compile_error!(concat!(
|
||||
"`",
|
||||
stringify!($pallet_name),
|
||||
"` does not have #[pallet::genesis_config] defined, perhaps you should \
|
||||
remove `Config` from construct_runtime?",
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
#[doc(hidden)]
|
||||
pub use #macro_ident as is_genesis_config_defined;
|
||||
}
|
||||
};
|
||||
};
|
||||
let frame_support = &def.frame_support;
|
||||
|
||||
@@ -57,5 +89,17 @@ pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
|
||||
_ => unreachable!("Checked by genesis_config parser"),
|
||||
}
|
||||
|
||||
Default::default()
|
||||
quote::quote! {
|
||||
#[doc(hidden)]
|
||||
pub mod __substrate_genesis_config_check {
|
||||
#[macro_export]
|
||||
#[doc(hidden)]
|
||||
macro_rules! #macro_ident {
|
||||
($pallet_name:ident) => {};
|
||||
}
|
||||
|
||||
#[doc(hidden)]
|
||||
pub use #macro_ident as is_genesis_config_defined;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
// This file is part of Substrate.
|
||||
|
||||
// Copyright (C) 2021 Parity Technologies (UK) Ltd.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use crate::pallet::Def;
|
||||
use proc_macro2::TokenStream;
|
||||
use quote::quote;
|
||||
use crate::COUNTER;
|
||||
use syn::{Ident, spanned::Spanned};
|
||||
|
||||
pub fn expand_inherents(def: &mut Def) -> TokenStream {
|
||||
let count = COUNTER.with(|counter| counter.borrow_mut().inc());
|
||||
let macro_ident = Ident::new(&format!("__is_inherent_part_defined_{}", count), def.item.span());
|
||||
|
||||
let maybe_compile_error = if def.inherent.is_none() {
|
||||
quote! {
|
||||
compile_error!(concat!(
|
||||
"`",
|
||||
stringify!($pallet_name),
|
||||
"` does not have #[pallet::inherent] defined, perhaps you should \
|
||||
remove `Inherent` from construct_runtime?",
|
||||
));
|
||||
}
|
||||
} else {
|
||||
TokenStream::new()
|
||||
};
|
||||
|
||||
quote! {
|
||||
#[doc(hidden)]
|
||||
pub mod __substrate_inherent_check {
|
||||
#[macro_export]
|
||||
#[doc(hidden)]
|
||||
macro_rules! #macro_ident {
|
||||
($pallet_name:ident) => {
|
||||
#maybe_compile_error
|
||||
}
|
||||
}
|
||||
|
||||
#[doc(hidden)]
|
||||
pub use #macro_ident as is_inherent_part_defined;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -24,10 +24,13 @@ mod event;
|
||||
mod storage;
|
||||
mod hooks;
|
||||
mod store_trait;
|
||||
mod inherent;
|
||||
mod instances;
|
||||
mod genesis_build;
|
||||
mod genesis_config;
|
||||
mod type_value;
|
||||
mod origin;
|
||||
mod validate_unsigned;
|
||||
|
||||
use crate::pallet::{Def, parse::helper::get_doc_literals};
|
||||
use quote::ToTokens;
|
||||
@@ -54,12 +57,15 @@ pub fn expand(mut def: Def) -> proc_macro2::TokenStream {
|
||||
let error = error::expand_error(&mut def);
|
||||
let event = event::expand_event(&mut def);
|
||||
let storages = storage::expand_storages(&mut def);
|
||||
let inherents = inherent::expand_inherents(&mut def);
|
||||
let instances = instances::expand_instances(&mut def);
|
||||
let store_trait = store_trait::expand_store_trait(&mut def);
|
||||
let hooks = hooks::expand_hooks(&mut def);
|
||||
let genesis_build = genesis_build::expand_genesis_build(&mut def);
|
||||
let genesis_config = genesis_config::expand_genesis_config(&mut def);
|
||||
let type_values = type_value::expand_type_values(&mut def);
|
||||
let origins = origin::expand_origins(&mut def);
|
||||
let validate_unsigned = validate_unsigned::expand_validate_unsigned(&mut def);
|
||||
|
||||
if get_doc_literals(&def.item.attrs).is_empty() {
|
||||
def.item.attrs.push(syn::parse_quote!(
|
||||
@@ -80,12 +86,15 @@ pub fn expand(mut def: Def) -> proc_macro2::TokenStream {
|
||||
#error
|
||||
#event
|
||||
#storages
|
||||
#inherents
|
||||
#instances
|
||||
#store_trait
|
||||
#hooks
|
||||
#genesis_build
|
||||
#genesis_config
|
||||
#type_values
|
||||
#origins
|
||||
#validate_unsigned
|
||||
);
|
||||
|
||||
def.item.content.as_mut().expect("This is checked by parsing").1
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
// This file is part of Substrate.
|
||||
|
||||
// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use crate::{pallet::Def, COUNTER};
|
||||
use proc_macro2::TokenStream;
|
||||
use quote::quote;
|
||||
use syn::{Ident, spanned::Spanned};
|
||||
|
||||
pub fn expand_origins(def: &mut Def) -> TokenStream {
|
||||
let count = COUNTER.with(|counter| counter.borrow_mut().inc());
|
||||
let macro_ident = Ident::new(&format!("__is_origin_part_defined_{}", count), def.item.span());
|
||||
|
||||
let maybe_compile_error = if def.origin.is_none() {
|
||||
quote! {
|
||||
compile_error!(concat!(
|
||||
"`",
|
||||
stringify!($pallet_name),
|
||||
"` does not have #[pallet::origin] defined, perhaps you should \
|
||||
remove `Origin` from construct_runtime?",
|
||||
));
|
||||
}
|
||||
} else {
|
||||
TokenStream::new()
|
||||
};
|
||||
|
||||
quote! {
|
||||
#[doc(hidden)]
|
||||
pub mod __substrate_origin_check {
|
||||
#[macro_export]
|
||||
#[doc(hidden)]
|
||||
macro_rules! #macro_ident {
|
||||
($pallet_name:ident) => {
|
||||
#maybe_compile_error
|
||||
}
|
||||
}
|
||||
|
||||
#[doc(hidden)]
|
||||
pub use #macro_ident as is_origin_part_defined;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
// This file is part of Substrate.
|
||||
|
||||
// Copyright (C) 2020-2021 Parity Technologies (UK) Ltd.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
use crate::pallet::Def;
|
||||
use proc_macro2::TokenStream;
|
||||
use quote::quote;
|
||||
use crate::COUNTER;
|
||||
use syn::{Ident, spanned::Spanned};
|
||||
|
||||
pub fn expand_validate_unsigned(def: &mut Def) -> TokenStream {
|
||||
let count = COUNTER.with(|counter| counter.borrow_mut().inc());
|
||||
let macro_ident = Ident::new(&format!("__is_validate_unsigned_part_defined_{}", count), def.item.span());
|
||||
|
||||
let maybe_compile_error = if def.validate_unsigned.is_none() {
|
||||
quote! {
|
||||
compile_error!(concat!(
|
||||
"`",
|
||||
stringify!($pallet_name),
|
||||
"` does not have #[pallet::validate_unsigned] defined, perhaps you should \
|
||||
remove `ValidateUnsigned` from construct_runtime?",
|
||||
));
|
||||
}
|
||||
} else {
|
||||
TokenStream::new()
|
||||
};
|
||||
|
||||
quote! {
|
||||
#[doc(hidden)]
|
||||
pub mod __substrate_validate_unsigned_check {
|
||||
#[macro_export]
|
||||
#[doc(hidden)]
|
||||
macro_rules! #macro_ident {
|
||||
($pallet_name:ident) => {
|
||||
#maybe_compile_error
|
||||
}
|
||||
}
|
||||
|
||||
#[doc(hidden)]
|
||||
pub use #macro_ident as is_validate_unsigned_part_defined;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user