forked from paritytech/polkadot-sdk
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FRAME] Warn on unchecked weight witness (paritytech#1818)
Adds a warning to FRAME pallets when a function argument that starts with `_` is used in the weight formula. This is in most cases an error since the weight witness needs to be checked. Example: ```rust #[pallet::call_index(0)] #[pallet::weight(T::SystemWeightInfo::remark(_remark.len() as u32))] pub fn remark(_origin: OriginFor<T>, _remark: Vec<u8>) -> DispatchResultWithPostInfo { Ok(().into()) } ``` Produces this warning: ```pre warning: use of deprecated constant `pallet::warnings::UncheckedWeightWitness_0::_w`: It is deprecated to not check weight witness data. Please instead ensure that all witness data for weight calculation is checked before usage. For more info see: <paritytech#1818> --> substrate/frame/system/src/lib.rs:424:40 | 424 | pub fn remark(_origin: OriginFor<T>, _remark: Vec<u8>) -> DispatchResultWithPostInfo { | ^^^^^^^ | = note: `#[warn(deprecated)]` on by default ``` Can be suppressed like this, since in this case it is legit: ```rust #[pallet::call_index(0)] #[pallet::weight(T::SystemWeightInfo::remark(remark.len() as u32))] pub fn remark(_origin: OriginFor<T>, remark: Vec<u8>) -> DispatchResultWithPostInfo { let _ = remark; // We dont need to check the weight witness. Ok(().into()) } ``` Changes: - Add warning on uncheded weight witness - Respect `subkeys` limit in `System::kill_prefix` - Fix HRMP pallet and other warnings - Update`proc_macro_warning` dependency - Delete random folder `substrate/src/src` 🙈 - Adding Prdoc --------- Signed-off-by: Oliver Tale-Yazdi <[email protected]> Co-authored-by: joe petrowski <[email protected]>
- Loading branch information
1 parent
2151bf6
commit 07719a0
Showing
16 changed files
with
190 additions
and
329 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
substrate/frame/support/procedural/src/pallet/expand/warnings.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
// This file is part of Substrate. | ||
|
||
// Copyright (C) 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. | ||
|
||
//! Generates warnings for undesirable pallet code. | ||
use crate::pallet::parse::call::{CallVariantDef, CallWeightDef}; | ||
use proc_macro_warning::Warning; | ||
use syn::{ | ||
spanned::Spanned, | ||
visit::{self, Visit}, | ||
}; | ||
|
||
/// Warn if any of the call arguments starts with a underscore and is used in a weight formula. | ||
pub(crate) fn weight_witness_warning( | ||
method: &CallVariantDef, | ||
dev_mode: bool, | ||
warnings: &mut Vec<Warning>, | ||
) { | ||
if dev_mode { | ||
return | ||
} | ||
let CallWeightDef::Immediate(w) = &method.weight else { | ||
return; | ||
}; | ||
|
||
let partial_warning = Warning::new_deprecated("UncheckedWeightWitness") | ||
.old("not check weight witness data") | ||
.new("ensure that all witness data for weight calculation is checked before usage") | ||
.help_link("https://github.com/paritytech/polkadot-sdk/pull/1818"); | ||
|
||
for (_, arg_ident, _) in method.args.iter() { | ||
if !arg_ident.to_string().starts_with('_') || !contains_ident(w.clone(), &arg_ident) { | ||
continue | ||
} | ||
|
||
let warning = partial_warning | ||
.clone() | ||
.index(warnings.len()) | ||
.span(arg_ident.span()) | ||
.build_or_panic(); | ||
|
||
warnings.push(warning); | ||
} | ||
} | ||
|
||
/// Warn if the weight is a constant and the pallet not in `dev_mode`. | ||
pub(crate) fn weight_constant_warning( | ||
weight: &syn::Expr, | ||
dev_mode: bool, | ||
warnings: &mut Vec<Warning>, | ||
) { | ||
if dev_mode { | ||
return | ||
} | ||
let syn::Expr::Lit(lit) = weight else { | ||
return; | ||
}; | ||
|
||
let warning = Warning::new_deprecated("ConstantWeight") | ||
.index(warnings.len()) | ||
.old("use hard-coded constant as call weight") | ||
.new("benchmark all calls or put the pallet into `dev` mode") | ||
.help_link("https://github.com/paritytech/substrate/pull/13798") | ||
.span(lit.span()) | ||
.build_or_panic(); | ||
|
||
warnings.push(warning); | ||
} | ||
|
||
/// Returns whether `expr` contains `ident`. | ||
fn contains_ident(mut expr: syn::Expr, ident: &syn::Ident) -> bool { | ||
struct ContainsIdent { | ||
ident: syn::Ident, | ||
found: bool, | ||
} | ||
|
||
impl<'a> Visit<'a> for ContainsIdent { | ||
fn visit_ident(&mut self, i: &syn::Ident) { | ||
if *i == self.ident { | ||
self.found = true; | ||
} | ||
} | ||
} | ||
|
||
let mut visitor = ContainsIdent { ident: ident.clone(), found: false }; | ||
visit::visit_expr(&mut visitor, &mut expr); | ||
visitor.found | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
substrate/frame/support/test/tests/pallet_ui/call_weight_unchecked_warning.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
// This file is part of Substrate. | ||
|
||
// Copyright (C) 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. | ||
|
||
#[frame_support::pallet] | ||
mod pallet { | ||
use frame_support::pallet_prelude::DispatchResult; | ||
use frame_system::pallet_prelude::OriginFor; | ||
|
||
#[pallet::config] | ||
pub trait Config: frame_system::Config {} | ||
|
||
#[pallet::pallet] | ||
pub struct Pallet<T>(core::marker::PhantomData<T>); | ||
|
||
#[pallet::call] | ||
impl<T: Config> Pallet<T> { | ||
#[pallet::call_index(0)] | ||
#[pallet::weight(*_unused)] | ||
pub fn foo(_: OriginFor<T>, _unused: u64) -> DispatchResult { Ok(()) } | ||
} | ||
} | ||
|
||
fn main() { | ||
} |
12 changes: 12 additions & 0 deletions
12
substrate/frame/support/test/tests/pallet_ui/call_weight_unchecked_warning.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
error: use of deprecated constant `pallet::warnings::UncheckedWeightWitness_0::_w`: | ||
It is deprecated to not check weight witness data. | ||
Please instead ensure that all witness data for weight calculation is checked before usage. | ||
|
||
For more info see: | ||
<https://github.com/paritytech/polkadot-sdk/pull/1818> | ||
--> tests/pallet_ui/call_weight_unchecked_warning.rs:33:31 | ||
| | ||
33 | pub fn foo(_: OriginFor<T>, _unused: u64) -> DispatchResult { Ok(()) } | ||
| ^^^^^^^ | ||
| | ||
= note: `-D deprecated` implied by `-D warnings` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.