Skip to content

Simplify update_class_permissions extrinsic #543

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

Merged
bedeho merged 1 commit into from
Jun 3, 2020
Merged

Simplify update_class_permissions extrinsic #543

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 45 additions & 27 deletions runtime-modules/content-directory/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,45 +879,27 @@ decl_module! {

let class = Self::ensure_known_class_id(class_id)?;

let mut class_permissions = class.get_permissions();

if let Some(ref updated_maintainers) = updated_maintainers {
Self::ensure_curator_groups_exist(updated_maintainers)?;
Self::ensure_maintainers_limit_not_reached(updated_maintainers)?;
}

let class_permissions = class.get_permissions();
let updated_class_permissions = Self::make_updated_class_permssions(
class_permissions, updated_any_member, updated_entity_creation_blocked,
updated_all_entity_property_values_locked, updated_maintainers
);

//
// == MUTATION SAFE ==
//

// If no update performed, there is no purpose to emit event
let mut updated = false;

if let Some(updated_any_member) = updated_any_member {
class_permissions.set_any_member_status(updated_any_member);
updated = true;
}

if let Some(updated_entity_creation_blocked) = updated_entity_creation_blocked {
class_permissions.set_entity_creation_blocked(updated_entity_creation_blocked);
updated = true;
}

if let Some(updated_all_entity_property_values_locked) = updated_all_entity_property_values_locked {
class_permissions.set_all_entity_property_values_locked(updated_all_entity_property_values_locked);
updated = true;
}

if let Some(updated_maintainers) = updated_maintainers {
class_permissions.set_maintainers(updated_maintainers);
updated = true;
}

if updated {
// If class_permissions update has been performed
if let Some(updated_class_permissions) = updated_class_permissions {

// Update `class_permissions` under given class id
<ClassById<T>>::mutate(class_id, |class| {
class.update_permissions(class_permissions)
class.update_permissions(updated_class_permissions)
});

// Trigger event
Expand Down Expand Up @@ -1681,6 +1663,42 @@ impl<T: Trait> Module<T> {
}
}

/// Used to update `class_permissions` with parameters provided.
/// Returns `Some(ClassPermissions<T>)` if update performed and `None` otherwise
pub fn make_updated_class_permssions(
class_permissions: ClassPermissions<T>,
updated_any_member: Option<bool>,
updated_entity_creation_blocked: Option<bool>,
updated_all_entity_property_values_locked: Option<bool>,
updated_maintainers: Option<BTreeSet<T::CuratorGroupId>>,
) -> Option<ClassPermissions<T>> {

// Used to ensure update performed
let mut updated_class_permissions = class_permissions.clone();

if let Some(updated_any_member) = updated_any_member {
updated_class_permissions.set_any_member_status(updated_any_member);
}

if let Some(updated_entity_creation_blocked) = updated_entity_creation_blocked {
updated_class_permissions.set_entity_creation_blocked(updated_entity_creation_blocked);
}

if let Some(updated_all_entity_property_values_locked) = updated_all_entity_property_values_locked {
updated_class_permissions.set_all_entity_property_values_locked(updated_all_entity_property_values_locked);
}

if let Some(updated_maintainers) = updated_maintainers {
updated_class_permissions.set_maintainers(updated_maintainers);
}

if updated_class_permissions != class_permissions {
Some(updated_class_permissions)
} else {
None
}
}

/// Returns class and entity under given id, if exists, and correspnding `origin` `EntityAccessLevel`, if permitted
fn ensure_class_entity_and_access_level(
origin: T::Origin,
Expand Down