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

Renames group to tree #126

Merged
merged 4 commits into from
Apr 5, 2021
Merged

Renames group to tree #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71ecd80
Renames group to tree
drewstone Apr 4, 2021
c5b49f4
Rename more
drewstone Apr 5, 2021
522569f
Fix naming err
drewstone Apr 5, 2021
5ae3735
Update pallets/mixer/src/lib.rs
drewstone Apr 5, 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
12 changes: 6 additions & 6 deletions pallets/merkle/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const VERIFY_DEPTH: u8 = 10;

fn setup_tree<T: Config>(caller: T::AccountId, depth: u32) {
let manager_required = true;
<Merkle<T> as Group<T::AccountId, T::BlockNumber, T::GroupId>>::create_group(caller, manager_required, depth as u8)
<Merkle<T> as Group<T::AccountId, T::BlockNumber, T::TreeId>>::create_group(caller, manager_required, depth as u8)
.unwrap();
}

Expand All @@ -37,7 +37,7 @@ benchmarks! {
let caller = whitelisted_caller();
}: _(RawOrigin::Signed(caller), false, Some(d as u8))
verify {
let next_id: T::GroupId = Merkle::<T>::next_group_id();
let next_id: T::TreeId = Merkle::<T>::next_group_id();
let curr_id = next_id - 1u32.into();
let group: GroupTree = Groups::<T>::get(curr_id).unwrap();
assert_eq!(group.depth, d as u8);
Expand All @@ -52,7 +52,7 @@ benchmarks! {
_(RawOrigin::Signed(caller.clone()), 0u32.into(), false)
verify {
// Checking if manager is caller and is not required
let group_id: T::GroupId = 0u32.into();
let group_id: T::TreeId = 0u32.into();
let manager = Managers::<T>::get(group_id).unwrap();
assert_eq!(manager.required, false);
assert_eq!(manager.account_id, caller.into());
Expand All @@ -67,7 +67,7 @@ benchmarks! {
// Transfering the admin role to `new_admin`
_(RawOrigin::Signed(caller), 0u32.into(), new_admin.clone())
verify {
let group_id: T::GroupId = 0u32.into();
let group_id: T::TreeId = 0u32.into();
let manager = Managers::<T>::get(group_id).unwrap();
assert_eq!(manager.required, true);
assert_eq!(manager.account_id, new_admin);
Expand All @@ -81,7 +81,7 @@ benchmarks! {
// any other functionality of the tree
_(RawOrigin::Signed(caller.clone()), 0u32.into(), true)
verify {
let group_id: T::GroupId = 0u32.into();
let group_id: T::TreeId = 0u32.into();
let stopped = Stopped::<T>::get(group_id);
assert!(stopped);
}
Expand All @@ -98,7 +98,7 @@ benchmarks! {
setup_tree::<T>(caller.clone(), 32);
}: _(RawOrigin::Signed(caller.clone()), 0u32.into(), leaves)
verify {
let group_id: T::GroupId = 0u32.into();
let group_id: T::TreeId = 0u32.into();
let group_tree: GroupTree = Groups::<T>::get(group_id).unwrap();
assert_eq!(group_tree.leaf_count, n);
}
Expand Down
Loading