Merge branch 'development' into integrate-content-wg

src/content_working_group/lib.rs

@@ -558,19 +558,19 @@ impl Default for ChannelContentType {
 /// is unaffected on runtime.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Encode, Decode, Debug, Clone, PartialEq)]
-pub enum ChannelPublishingStatus {
+pub enum ChannelPublicationStatus {
     /// Compliant UIs should render.
-    Published,
+    Public,
 
     /// Compliant UIs should not render it or any child content.
-    NotPublished,
+    Unlisted,
 }
 
 /// Must be default constructible because it indirectly is a value in a storage map.
 /// ***SHOULD NEVER ACTUALLY GET CALLED, IS REQUIRED TO DUE BAD STORAGE MODEL IN SUBSTRATE***
-impl Default for ChannelPublishingStatus {
+impl Default for ChannelPublicationStatus {
     fn default() -> Self {
-        ChannelPublishingStatus::Published
+        ChannelPublicationStatus::Public
     }
 }
 
@@ -628,7 +628,7 @@ pub struct Channel<MemberId, AccountId, BlockNumber, PrincipalId> {
     pub role_account: AccountId,
 
     /// Publication status of channel.
-    pub publishing_status: ChannelPublishingStatus,
+    pub publication_status: ChannelPublicationStatus,
 
     /// Curation status of channel.
     pub curation_status: ChannelCurationStatus,
@@ -1116,7 +1116,7 @@ decl_module! {
             description: OptionalText,
             avatar: OptionalText,
             banner: OptionalText,
-            publishing_status: ChannelPublishingStatus
+            publication_status: ChannelPublicationStatus
         ) {
 
             // Ensure that it is signed
@@ -1169,7 +1169,7 @@ decl_module! {
                 content: content,
                 owner: owner,
                 role_account: role_account,
-                publishing_status: publishing_status,
+                publication_status: publication_status,
                 curation_status: ChannelCurationStatus::Normal,
                 created: <system::Module<T>>::block_number(),
                 principal_id: principal_id
@@ -1199,7 +1199,7 @@ decl_module! {
         /// An owner transfers channel ownership to a new owner.
         ///
         /// Notice that working group participants cannot do this.
-        /// Notice that censored or unpublished channel may still be transferred.
+        /// Notice that censored or unlisted channel may still be transferred.
         /// Notice that transfers are unilateral, so new owner cannot block. This may be problematic: https://github.com/Joystream/substrate-runtime-joystream/issues/95
         pub fn transfer_channel_ownership(origin, channel_id: ChannelId<T>, new_owner: T::MemberId, new_role_account: T::AccountId) {
 
@@ -1249,7 +1249,7 @@ decl_module! {
             new_description: Option<OptionalText>,
             new_avatar: Option<OptionalText>,
             new_banner: Option<OptionalText>,
-            new_publishing_status: Option<ChannelPublishingStatus>
+            new_publication_status: Option<ChannelPublicationStatus>
         ) {
 
             // Ensure channel owner has signed
@@ -1292,7 +1292,7 @@ decl_module! {
                 &new_description,
                 &new_avatar,
                 &new_banner,
-                &new_publishing_status,
+                &new_publication_status,
                 &None // curation_status
             );
         }
@@ -1321,7 +1321,7 @@ decl_module! {
                 &None, // description,
                 &None, // avatar
                 &None, // banner
-                &None, // publishing_status
+                &None, // publication_status
                 &new_curation_status
             );
         }
@@ -2635,7 +2635,7 @@ impl<T: Trait> Module<T> {
         new_description: &Option<OptionalText>,
         new_avatar: &Option<OptionalText>,
         new_banner: &Option<OptionalText>,
-        new_publishing_status: &Option<ChannelPublishingStatus>,
+        new_publication_status: &Option<ChannelPublicationStatus>,
         new_curation_status: &Option<ChannelCurationStatus>,
     ) {
         // Update channel id to handle mapping, if there is a new handle.
@@ -2674,8 +2674,8 @@ impl<T: Trait> Module<T> {
                 channel.banner = banner.clone();
             }
 
-            if let Some(ref publishing_status) = new_publishing_status {
-                channel.publishing_status = publishing_status.clone();
+            if let Some(ref publication_status) = new_publication_status {
+                channel.publication_status = publication_status.clone();
             }
 
             if let Some(ref curation_status) = new_curation_status {

src/content_working_group/tests.rs

@@ -220,7 +220,7 @@ impl UpdateChannelAsCurationActorFixture {
             content: old_channel.content,
             owner: old_channel.owner,
             role_account: old_channel.role_account,
-            publishing_status: old_channel.publishing_status,
+            publication_status: old_channel.publication_status,
             curation_status: upd_curation_status,
             created: old_channel.created,
             principal_id: old_channel.principal_id,
@@ -1856,7 +1856,7 @@ struct CreateChannelFixture {
     pub avatar: OptionalText,
     pub banner: OptionalText,
     pub content: ChannelContentType,
-    pub publishing_status: ChannelPublishingStatus,
+    pub publication_status: ChannelPublicationStatus,
 }
 
 impl CreateChannelFixture {
@@ -1884,7 +1884,7 @@ impl CreateChannelFixture {
                 &ChannelDescriptionConstraint::get(),
             )),
             content: ChannelContentType::Video,
-            publishing_status: ChannelPublishingStatus::NotPublished,
+            publication_status: ChannelPublicationStatus::Unlisted,
         }
     }
 
@@ -1899,7 +1899,7 @@ impl CreateChannelFixture {
             self.description.clone(),
             self.avatar.clone(),
             self.banner.clone(),
-            self.publishing_status.clone(),
+            self.publication_status.clone(),
         )
     }
 
@@ -1947,7 +1947,7 @@ impl CreateChannelFixture {
             content: self.content.clone(),
             owner: self.channel_creator_member_id,
             role_account: self.channel_creator_role_account,
-            publishing_status: self.publishing_status.clone(),
+            publication_status: self.publication_status.clone(),
             curation_status: ChannelCurationStatus::Normal,
             created: 1, // <== replace with now()