Browse Source

Content: better check namings

iorveth 4 years ago
parent
commit
33c74e62e8
2 changed files with 11 additions and 10 deletions
  1. 8 8
      runtime-modules/content/src/lib.rs
  2. 3 2
      runtime-modules/content/src/permissions/mod.rs

+ 8 - 8
runtime-modules/content/src/lib.rs

@@ -667,7 +667,7 @@ decl_module! {
             actor: ContentActor<T::CuratorGroupId, T::CuratorId, T::MemberId>,
             params: ChannelCreationParameters<ContentParameters<T>, T::AccountId>,
         ) {
-            ensure_actor_authorized_to_create_channel_assets::<T>(
+            ensure_actor_authorized_to_create_channels_and_videos_assets::<T>(
                 origin,
                 &actor,
             )?;
@@ -724,7 +724,7 @@ decl_module! {
             // check that channel exists
             let channel = Self::ensure_channel_exists(&channel_id)?;
 
-            ensure_actor_authorized_to_update_or_delete_channel_assets::<T>(
+            ensure_actor_authorized_update_channel_and_videos::<T>(
                 origin,
                 &actor,
                 &channel.owner,
@@ -783,7 +783,7 @@ decl_module! {
             // check that channel exists
             let channel = Self::ensure_channel_exists(&channel_id)?;
 
-            ensure_actor_authorized_to_update_or_delete_channel_assets::<T>(
+            ensure_actor_authorized_update_channel_and_videos::<T>(
                 origin,
                 &actor,
                 &channel.owner,
@@ -831,7 +831,7 @@ decl_module! {
             // check that channel exists
             let channel = Self::ensure_channel_exists(&channel_id)?;
 
-            ensure_actor_authorized_to_update_or_delete_channel_assets::<T>(
+            ensure_actor_authorized_update_channel_and_videos::<T>(
                 origin,
                 &actor,
                 &channel.owner,
@@ -1040,7 +1040,7 @@ decl_module! {
             channel_id: T::ChannelId,
             params: VideoCreationParameters<ContentParameters<T>>,
         ) {
-            ensure_actor_authorized_to_create_channel_assets::<T>(
+            ensure_actor_authorized_to_create_channels_and_videos_assets::<T>(
                 origin,
                 &actor,
             )?;
@@ -1098,7 +1098,7 @@ decl_module! {
             // check that video exists, retrieve corresponding channel id.
             let channel_id = Self::ensure_video_exists(&video_id)?.in_channel;
 
-            ensure_actor_authorized_to_update_or_delete_channel_assets::<T>(
+            ensure_actor_authorized_update_channel_and_videos::<T>(
                 origin,
                 &actor,
                 // The channel owner will be..
@@ -1151,7 +1151,7 @@ decl_module! {
 
             let channel_id = video.in_channel;
 
-            ensure_actor_authorized_to_update_or_delete_channel_assets::<T>(
+            ensure_actor_authorized_update_channel_and_videos::<T>(
                 origin,
                 &actor,
                 // The channel owner will be..
@@ -1215,7 +1215,7 @@ decl_module! {
             list: Vec<T::VideoId>
         ) {
             // can only be set by lead
-            ensure_actor_authorized_to_update_or_delete_channel_assets::<T>(
+            ensure_actor_authorized_update_channel_and_videos::<T>(
                 origin,
                 &actor,
                 // The channel owner will be..

+ 3 - 2
runtime-modules/content/src/permissions/mod.rs

@@ -99,7 +99,7 @@ pub fn ensure_is_lead<T: Trait>(origin: T::Origin) -> DispatchResult {
     ensure_lead_auth_success::<T>(&account_id)
 }
 
-pub fn ensure_actor_authorized_to_create_channel_assets<T: Trait>(
+pub fn ensure_actor_authorized_to_create_channels_and_videos_assets<T: Trait>(
     origin: T::Origin,
     actor: &ContentActor<T::CuratorGroupId, T::CuratorId, T::MemberId>,
 ) -> DispatchResult {
@@ -128,7 +128,8 @@ pub fn ensure_actor_authorized_to_create_channel_assets<T: Trait>(
     }
 }
 
-pub fn ensure_actor_authorized_to_update_or_delete_channel_assets<T: Trait>(
+// Enure actor can update or delete channels and videos
+pub fn ensure_actor_authorized_update_channel_and_videos<T: Trait>(
     origin: T::Origin,
     actor: &ContentActor<T::CuratorGroupId, T::CuratorId, T::MemberId>,
     owner: &ChannelOwner<T::MemberId, T::CuratorGroupId, T::DAOId>,