Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Fixes error message when _ is used without dev mode #13886

Merged
gupnik merged 10 commits into from
Apr 12, 2023
Merged

Fixes error message when _ is used without dev mode #13886

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c7d0b9a
Initial changes
codekitz Apr 4, 2023
0dfd671
Adds UI test for error when _ is used without dev_mode
codekitz Apr 4, 2023
709986d
Minor
codekitz Apr 4, 2023
72c6dc9
".git/.scripts/commands/fmt/fmt.sh"
Apr 4, 2023
243cf01
Adds test to verify hasher
codekitz Apr 11, 2023
3a23150
Merge branch 'master' of github.com:paritytech/substrate into gupnik/…
codekitz Apr 11, 2023
8fcc35b
Fixes error message when _ is used without dev mode
codekitz Apr 12, 2023
ac18f1b
Merge branch 'master' of github.com:paritytech/substrate into gupnik/…
codekitz Apr 12, 2023
cc75da2
Updates test
codekitz Apr 12, 2023
3b72666
Addresses review comment
codekitz Apr 12, 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
18 changes: 12 additions & 6 deletions frame/support/procedural/src/pallet/parse/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,10 +514,16 @@ fn process_unnamed_generics(
})?;

let use_default_hasher = |arg_pos| {
if let Some(arg) = retrieve_arg(arg_pos).ok() {
dev_mode && syn::parse2::<syn::Token![_]>(arg.to_token_stream()).is_ok()
let arg = retrieve_arg(arg_pos)?;
if syn::parse2::<syn::Token![_]>(arg.to_token_stream()).is_ok() {
if dev_mode {
Ok(true)
} else {
let msg = "`_` can only be used in dev_mode. Please specify an appropriate hasher.";
Err(syn::Error::new(args_span, msg))
Copy link
Member

@bkchr bkchr Apr 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Err(syn::Error::new(args_span, msg))
Err(syn::Error::new(arg.span(), msg))

To highlight exactly which argument we mean.

Copy link
Contributor Author

@gupnik gupnik Apr 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thank you.

}
} else {
false
Ok(false)
}
};

Expand All @@ -528,13 +534,13 @@ fn process_unnamed_generics(
None,
Metadata::Map { key: retrieve_arg(2)?, value: retrieve_arg(3)? },
retrieve_arg(4).ok(),
use_default_hasher(1),
use_default_hasher(1)?,
),
StorageKind::CountedMap => (
None,
Metadata::CountedMap { key: retrieve_arg(2)?, value: retrieve_arg(3)? },
retrieve_arg(4).ok(),
use_default_hasher(1),
use_default_hasher(1)?,
),
StorageKind::DoubleMap => (
None,
Expand All @@ -544,7 +550,7 @@ fn process_unnamed_generics(
value: retrieve_arg(5)?,
},
retrieve_arg(6).ok(),
use_default_hasher(1) && use_default_hasher(3),
use_default_hasher(1)? && use_default_hasher(3)?,
),
StorageKind::NMap => {
let keygen = retrieve_arg(1)?;
Expand Down