Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preimage: Check that at least one is upgraded #1648

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Preimage: Check that at least one is upgraded #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69ee702
Preimage: Check that at least one is upgraded
gavofyork Sep 20, 2023
4cf2e8e
Fix bench
ggwpez Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion substrate/frame/preimage/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ benchmarks! {
}

ensure_updated {
let n in 0..MAX_HASH_UPGRADE_BULK_COUNT;
let n in 1..MAX_HASH_UPGRADE_BULK_COUNT;

let caller = funded_account::<T>();
let hashes = (0..n).map(|i| insert_old_unrequested::<T>(i)).collect::<Vec<_>>();
Expand Down
3 changes: 3 additions & 0 deletions substrate/frame/preimage/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ pub mod pallet {
NotRequested,
/// More than `MAX_HASH_UPGRADE_BULK_COUNT` hashes were requested to be upgraded at once.
TooMany,
/// Too few hashes were requested to be upgraded (i.e. zero).
TooFew,
}

/// A reason for this pallet placing a hold on funds.
Expand Down Expand Up @@ -242,6 +244,7 @@ pub mod pallet {
hashes: Vec<T::Hash>,
) -> DispatchResultWithPostInfo {
ensure_signed(origin)?;
ensure!(hashes.len() > 0, Error::<T>::TooFew);
ensure!(hashes.len() <= MAX_HASH_UPGRADE_BULK_COUNT as usize, Error::<T>::TooMany);

let updated = hashes.iter().map(Self::do_ensure_updated).filter(|b| *b).count() as u32;
Expand Down