added optional assets & meta at creation

runtime-modules/content/src/lib.rs

@@ -1107,7 +1107,6 @@ decl_module! {
                 // The channel owner will be..
                 &channel.owner,
             )?;
-
             Self::ensure_video_can_be_removed(&video)?;
 
             // If video is on storage, remove it

runtime-modules/content/src/tests/channels.rs

@@ -44,8 +44,8 @@ fn successful_channel_deletion() {
             FIRST_MEMBER_ORIGIN,
             ContentActor::Member(FIRST_MEMBER_ID),
             ChannelCreationParametersRecord {
-                assets: assets,
-                meta: vec![],
+                assets: Some(assets),
+                meta: Some(vec![]),
                 reward_account: None,
             },
             Ok(()),
@@ -121,8 +121,8 @@ fn successful_channel_assets_deletion() {
             FIRST_MEMBER_ORIGIN,
             ContentActor::Member(FIRST_MEMBER_ID),
             ChannelCreationParametersRecord {
-                assets: assets,
-                meta: vec![],
+                assets: Some(assets),
+                meta: Some(vec![]),
                 reward_account: None,
             },
             Ok(()),
@@ -189,8 +189,8 @@ fn succesful_channel_update() {
             FIRST_MEMBER_ORIGIN,
             ContentActor::Member(FIRST_MEMBER_ID),
             ChannelCreationParametersRecord {
-                assets: assets,
-                meta: vec![],
+                assets: Some(assets),
+                meta: Some(vec![]),
                 reward_account: None,
             },
             Ok(()),
@@ -203,7 +203,7 @@ fn succesful_channel_update() {
             channel_id,
             ChannelUpdateParametersRecord {
                 assets: Some(new_assets),
-                new_meta: None,
+                new_meta: Some(vec![]),
                 reward_account: None,
             },
             Ok(()),
@@ -260,8 +260,8 @@ fn succesful_channel_creation() {
             FIRST_MEMBER_ORIGIN,
             ContentActor::Member(FIRST_MEMBER_ID),
             ChannelCreationParametersRecord {
-                assets: assets,
-                meta: vec![],
+                assets: Some(assets),
+                meta: Some(vec![]),
                 reward_account: None,
             },
             Ok(()),
@@ -277,8 +277,8 @@ fn lead_cannot_create_channel() {
                 Origin::signed(LEAD_ORIGIN),
                 ContentActor::Lead,
                 ChannelCreationParametersRecord {
-                    assets: NewAssets::<Test>::Urls(vec![]),
-                    meta: vec![],
+                    assets: Some(NewAssets::<Test>::Urls(vec![])),
+                    meta: Some(vec![]),
                     reward_account: None,
                 }
             ),
@@ -299,8 +299,8 @@ fn curator_owned_channels() {
                 Origin::signed(FIRST_CURATOR_ORIGIN),
                 ContentActor::Curator(FIRST_CURATOR_GROUP_ID, FIRST_CURATOR_ID),
                 ChannelCreationParametersRecord {
-                    assets: NewAssets::<Test>::Urls(vec![]),
-                    meta: vec![],
+                    assets: Some(NewAssets::<Test>::Urls(vec![])),
+                    meta: Some(vec![]),
                     reward_account: None,
                 }
             ),
@@ -316,8 +316,8 @@ fn curator_owned_channels() {
                 Origin::signed(SECOND_CURATOR_ORIGIN),
                 ContentActor::Curator(FIRST_CURATOR_GROUP_ID, SECOND_CURATOR_ID),
                 ChannelCreationParametersRecord {
-                    assets: NewAssets::<Test>::Urls(vec![]),
-                    meta: vec![],
+                    assets: Some(NewAssets::<Test>::Urls(vec![])),
+                    meta: Some(vec![]),
                     reward_account: None,
                 }
             ),
@@ -330,8 +330,8 @@ fn curator_owned_channels() {
                 Origin::signed(SECOND_CURATOR_ORIGIN),
                 ContentActor::Curator(FIRST_CURATOR_GROUP_ID, FIRST_CURATOR_ID),
                 ChannelCreationParametersRecord {
-                    assets: NewAssets::<Test>::Urls(vec![]),
-                    meta: vec![],
+                    assets: Some(NewAssets::<Test>::Urls(vec![])),
+                    meta: Some(vec![]),
                     reward_account: None,
                 }
             ),
@@ -345,8 +345,8 @@ fn curator_owned_channels() {
             Origin::signed(FIRST_CURATOR_ORIGIN),
             ContentActor::Curator(FIRST_CURATOR_GROUP_ID, FIRST_CURATOR_ID),
             ChannelCreationParametersRecord {
-                assets: NewAssets::<Test>::Urls(vec![]),
-                meta: vec![],
+                assets: Some(NewAssets::<Test>::Urls(vec![])),
+                meta: Some(vec![]),
                 reward_account: None,
             }
         ));
@@ -365,8 +365,8 @@ fn curator_owned_channels() {
                     num_videos: 0,
                 },
                 ChannelCreationParametersRecord {
-                    assets: NewAssets::<Test>::Urls(vec![]),
-                    meta: vec![],
+                    assets: Some(NewAssets::<Test>::Urls(vec![])),
+                    meta: Some(vec![]),
                     reward_account: None,
                 }
             ))
@@ -410,8 +410,8 @@ fn member_owned_channels() {
                 Origin::signed(UNKNOWN_ORIGIN),
                 ContentActor::Member(MEMBERS_COUNT + 1),
                 ChannelCreationParametersRecord {
-                    assets: NewAssets::<Test>::Urls(vec![]),
-                    meta: vec![],
+                    assets: Some(NewAssets::<Test>::Urls(vec![])),
+                    meta: Some(vec![]),
                     reward_account: None,
                 }
             ),
@@ -425,8 +425,8 @@ fn member_owned_channels() {
             Origin::signed(FIRST_MEMBER_ORIGIN),
             ContentActor::Member(FIRST_MEMBER_ID),
             ChannelCreationParametersRecord {
-                assets: NewAssets::<Test>::Urls(vec![]),
-                meta: vec![],
+                assets: Some(NewAssets::<Test>::Urls(vec![])),
+                meta: Some(vec![]),
                 reward_account: None,
             }
         ));
@@ -445,8 +445,8 @@ fn member_owned_channels() {
                     num_videos: 0,
                 },
                 ChannelCreationParametersRecord {
-                    assets: NewAssets::<Test>::Urls(vec![]),
-                    meta: vec![],
+                    assets: Some(NewAssets::<Test>::Urls(vec![])),
+                    meta: Some(vec![]),
                     reward_account: None,
                 }
             ))
@@ -459,8 +459,8 @@ fn member_owned_channels() {
             Origin::signed(SECOND_MEMBER_ORIGIN),
             ContentActor::Member(SECOND_MEMBER_ID),
             ChannelCreationParametersRecord {
-                assets: NewAssets::<Test>::Urls(vec![]),
-                meta: vec![],
+                assets: Some(NewAssets::<Test>::Urls(vec![])),
+                meta: Some(vec![]),
                 reward_account: None,
             }
         ));
@@ -479,8 +479,8 @@ fn member_owned_channels() {
                     num_videos: 0,
                 },
                 ChannelCreationParametersRecord {
-                    assets: NewAssets::<Test>::Urls(vec![]),
-                    meta: vec![],
+                    assets: Some(NewAssets::<Test>::Urls(vec![])),
+                    meta: Some(vec![]),
                     reward_account: None,
                 }
             ))
@@ -547,8 +547,8 @@ fn channel_censoring() {
             Origin::signed(FIRST_MEMBER_ORIGIN),
             ContentActor::Member(FIRST_MEMBER_ID),
             ChannelCreationParametersRecord {
-                assets: NewAssets::<Test>::Urls(vec![]),
-                meta: vec![],
+                assets: Some(NewAssets::<Test>::Urls(vec![])),
+                meta: Some(vec![]),
                 reward_account: None,
             }
         ));
@@ -623,8 +623,8 @@ fn channel_censoring() {
             Origin::signed(FIRST_CURATOR_ORIGIN),
             ContentActor::Curator(group_id, FIRST_CURATOR_ID),
             ChannelCreationParametersRecord {
-                assets: NewAssets::<Test>::Urls(vec![]),
-                meta: vec![],
+                assets: Some(NewAssets::<Test>::Urls(vec![])),
+                meta: Some(vec![]),
                 reward_account: None,
             }
         ));

runtime-modules/content/src/tests/mock.rs

@@ -447,28 +447,30 @@ pub fn create_channel_mock(
     );
 
     if result.is_ok() {
-        let num_assets = match params.assets.clone() {
-            NewAssets::<Test>::Urls(v) => v.len() as u64,
-            NewAssets::<Test>::Upload(c) => c.object_creation_list.len() as u64,
-        };
-        let owner = Content::actor_to_channel_owner(&actor).unwrap();
-
-        assert_eq!(
-            System::events().last().unwrap().event,
-            MetaEvent::content(RawEvent::ChannelCreated(
-                actor.clone(),
-                channel_id,
-                ChannelRecord {
-                    owner: owner,
-                    is_censored: false,
-                    reward_account: params.reward_account,
-                    deletion_prize_source_account_id: sender,
-                    num_assets: num_assets,
-                    num_videos: 0,
-                },
-                params.clone(),
-            ))
-        );
+        if let Some(assets) = params.assets.as_ref() {
+            let num_assets = match &assets {
+                NewAssets::<Test>::Urls(v) => v.len() as u64,
+                NewAssets::<Test>::Upload(c) => c.object_creation_list.len() as u64,
+            };
+            let owner = Content::actor_to_channel_owner(&actor).unwrap();
+
+            assert_eq!(
+                System::events().last().unwrap().event,
+                MetaEvent::content(RawEvent::ChannelCreated(
+                    actor.clone(),
+                    channel_id,
+                    ChannelRecord {
+                        owner: owner,
+                        is_censored: false,
+                        reward_account: params.reward_account,
+                        deletion_prize_source_account_id: sender,
+                        num_assets: num_assets,
+                        num_videos: 0,
+                    },
+                    params.clone(),
+                ))
+            );
+        }
     }
 }
 

runtime-modules/content/src/tests/videos.rs

@@ -14,8 +14,8 @@ fn create_member_channel() -> ChannelId {
         Origin::signed(FIRST_MEMBER_ORIGIN),
         ContentActor::Member(FIRST_MEMBER_ID),
         ChannelCreationParametersRecord {
-            assets: NewAssets::<Test>::Urls(vec![]),
-            meta: vec![],
+            assets: Some(NewAssets::<Test>::Urls(vec![])),
+            meta: Some(vec![]),
             reward_account: None,
         }
     ));
@@ -40,8 +40,8 @@ fn video_creation_successful() {
             FIRST_MEMBER_ORIGIN,
             ContentActor::Member(FIRST_MEMBER_ID),
             ChannelCreationParametersRecord {
-                assets: NewAssets::<Test>::Urls(vec![]),
-                meta: vec![],
+                assets: Some(NewAssets::<Test>::Urls(vec![])),
+                meta: Some(vec![]),
                 reward_account: None,
             },
             Ok(()),
@@ -94,8 +94,8 @@ fn video_update_successful() {
             FIRST_MEMBER_ORIGIN,
             ContentActor::Member(FIRST_MEMBER_ID),
             ChannelCreationParametersRecord {
-                assets: NewAssets::<Test>::Urls(vec![]),
-                meta: vec![],
+                assets: Some(NewAssets::<Test>::Urls(vec![])),
+                meta: Some(vec![]),
                 reward_account: None,
             },
             Ok(()),