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

Ensure data size of identity pallet is bounded #9168

Merged
19 commits merged into from
Jul 8, 2021
Merged

Ensure data size of identity pallet is bounded #9168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6bb2f4b
Ensure data size of identity pallet is bounded
KiChjang Jun 22, 2021
228c939
Fix unit tests for identity pallet
KiChjang Jun 22, 2021
aee3907
Move identity pallet custom types into its own module
KiChjang Jun 22, 2021
0ec33a2
Make use of NoBound family traits
KiChjang Jun 22, 2021
86504cc
Fix identity pallet benchmarks
KiChjang Jun 22, 2021
f5d790e
Enumerate type imports
KiChjang Jun 22, 2021
d9fb577
Properly convert to BoundedVec in benchmarks
KiChjang Jun 22, 2021
80d94b7
Re-export types
KiChjang Jun 22, 2021
ddf65ef
Use BoundedVec when storing sub identities
KiChjang Jun 22, 2021
35d6fa7
Add generate_storage_info
KiChjang Jun 22, 2021
d2291f1
Manually implement MaxEncodedLen on select types
KiChjang Jun 23, 2021
cd87e24
Use ConstU32 instead of parameter_type
KiChjang Jun 24, 2021
cab3193
Leverage DefaultNoBound and add some comments
KiChjang Jun 24, 2021
78814b6
Use max_encoded_len() instead of hardcoded constant
KiChjang Jun 24, 2021
be9954b
Merge remote-tracking branch 'origin/master' into kckyeung/bounded-id…
KiChjang Jul 6, 2021
c892b62
Use MaxEncodedLen in parity-scal-codec
KiChjang Jul 6, 2021
36d917c
Add get_mut method for WeakBoundedVec
KiChjang Jul 7, 2021
263c3f4
Use expect on an infallible operation
KiChjang Jul 8, 2021
8d30b52
Rewrite as for loop
KiChjang Jul 8, 2021
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 frame/identity/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.2.0", default-features = false, features = ["derive", "max-encoded-len"] }
enumflags2 = { version = "0.6.2" }
sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
Expand Down
14 changes: 7 additions & 7 deletions frame/identity/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fn add_registrars<T: Config>(r: u32) -> Result<(), &'static str> {
fn create_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::AccountId, Data)>, &'static str> {
let mut subs = Vec::new();
let who_origin = RawOrigin::Signed(who.clone());
let data = Data::Raw(vec![0; 32]);
let data = Data::Raw(vec![0; 32].try_into().unwrap());

for i in 0..s {
let sub_account = account("sub", i, SEED);
Expand Down Expand Up @@ -84,11 +84,11 @@ fn add_sub_accounts<T: Config>(who: &T::AccountId, s: u32) -> Result<Vec<(T::Acc

// This creates an `IdentityInfo` object with `num_fields` extra fields.
// All data is pre-populated with some arbitrary bytes.
fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo {
let data = Data::Raw(vec![0; 32]);
fn create_identity_info<T: Config>(num_fields: u32) -> IdentityInfo<T::MaxAdditionalFields> {
let data = Data::Raw(vec![0; 32].try_into().unwrap());

let info = IdentityInfo {
additional: vec![(data.clone(), data.clone()); num_fields as usize],
additional: vec![(data.clone(), data.clone()); num_fields as usize].try_into().unwrap(),
display: data.clone(),
legal: data.clone(),
web: data.clone(),
Expand Down Expand Up @@ -353,7 +353,7 @@ benchmarks! {
let caller: T::AccountId = whitelisted_caller();
let _ = add_sub_accounts::<T>(&caller, s)?;
let sub = account("new_sub", 0, SEED);
let data = Data::Raw(vec![0; 32]);
let data = Data::Raw(vec![0; 32].try_into().unwrap());
ensure!(SubsOf::<T>::get(&caller).1.len() as u32 == s, "Subs not set.");
}: _(RawOrigin::Signed(caller.clone()), T::Lookup::unlookup(sub), data)
verify {
Expand All @@ -365,7 +365,7 @@ benchmarks! {

let caller: T::AccountId = whitelisted_caller();
let (sub, _) = add_sub_accounts::<T>(&caller, s)?.remove(0);
let data = Data::Raw(vec![1; 32]);
let data = Data::Raw(vec![1; 32].try_into().unwrap());
ensure!(SuperOf::<T>::get(&sub).unwrap().1 != data, "data already set");
}: _(RawOrigin::Signed(caller), T::Lookup::unlookup(sub.clone()), data.clone())
verify {
Expand All @@ -390,7 +390,7 @@ benchmarks! {
let sup = account("super", 0, SEED);
let _ = add_sub_accounts::<T>(&sup, s)?;
let sup_origin = RawOrigin::Signed(sup).into();
Identity::<T>::add_sub(sup_origin, T::Lookup::unlookup(caller.clone()), Data::Raw(vec![0; 32]))?;
Identity::<T>::add_sub(sup_origin, T::Lookup::unlookup(caller.clone()), Data::Raw(vec![0; 32].try_into().unwrap()))?;
ensure!(SuperOf::<T>::contains_key(&caller), "Sub doesn't exists");
}: _(RawOrigin::Signed(caller.clone()))
verify {
Expand Down
Loading