@@ -55,7 +55,7 @@ use sp_runtime::{
5555use sp_std:: { collections:: btree_set:: BTreeSet , vec:: Vec } ;
5656/// Module configuration trait for Content Directory Module
5757pub trait Trait :
58- frame_system:: Trait
58+ frame_system:: Trait
5959 + ContentActorAuthenticator
6060 + Clone
6161 + membership:: Trait
@@ -474,7 +474,6 @@ decl_module! {
474474 Self :: deposit_event( RawEvent :: ChannelCreated ( actor, channel_id, channel, params) ) ;
475475 }
476476
477- // Include Option<AccountId> in ChannelUpdateParameters to update reward_account
478477 #[ weight = 10_000_000 ] // TODO: adjust weight
479478 pub fn update_channel(
480479 origin,
@@ -1504,11 +1503,11 @@ decl_module! {
15041503 //
15051504
15061505 // Issue NFT
1507- let video = video. set_nft_status( OwnedNFT :: new(
1508- nft_owner,
1509- params. royalty. clone( ) ,
1510- transactional_status,
1511- ) ) ;
1506+ let video = video. set_nft_status( OwnedNFT :: new(
1507+ nft_owner,
1508+ params. royalty. clone( ) ,
1509+ transactional_status,
1510+ ) ) ;
15121511
15131512 // Update the video
15141513 VideoById :: <T >:: insert( video_id, video) ;
@@ -2266,14 +2265,14 @@ impl<T: Trait> Module<T> {
22662265 pub fn ensure_valid_init_transactional_status (
22672266 init_status : & InitTransactionalStatus < T > ,
22682267 ) -> Result <
2269- TransactionalStatus <
2270- <T as frame_system:: Trait >:: BlockNumber ,
2271- <T as common:: MembershipTypes >:: MemberId ,
2272- <T as frame_system:: Trait >:: AccountId ,
2273- CurrencyOf < T > ,
2274- > ,
2268+ TransactionalStatus <
2269+ <T as frame_system:: Trait >:: BlockNumber ,
2270+ <T as common:: MembershipTypes >:: MemberId ,
2271+ <T as frame_system:: Trait >:: AccountId ,
2272+ CurrencyOf < T > ,
2273+ > ,
22752274 DispatchError ,
2276- > {
2275+ > {
22772276 match init_status {
22782277 InitTransactionalStatus :: < T > :: Idle => Ok ( TransactionalStatus :: Idle ) ,
22792278 InitTransactionalStatus :: < T > :: InitiatedOfferToMember ( member, balance) => Ok (
@@ -2380,44 +2379,44 @@ decl_event!(
23802379 where
23812380 ContentActor = ContentActor <
23822381 <T as ContentActorAuthenticator >:: CuratorGroupId ,
2383- <T as ContentActorAuthenticator >:: CuratorId ,
2384- <T as common:: MembershipTypes >:: MemberId ,
2385- >,
2386- MemberId = <T as common:: MembershipTypes >:: MemberId ,
2387- CuratorGroupId = <T as ContentActorAuthenticator >:: CuratorGroupId ,
2388- CuratorId = <T as ContentActorAuthenticator >:: CuratorId ,
2389- VideoId = <T as Trait >:: VideoId ,
2390- VideoCategoryId = <T as Trait >:: VideoCategoryId ,
2391- ChannelId = <T as storage:: Trait >:: ChannelId ,
2392- ChannelCategoryId = <T as Trait >:: ChannelCategoryId ,
2393- ChannelOwnershipTransferRequestId = <T as Trait >:: ChannelOwnershipTransferRequestId ,
2394- PlaylistId = <T as Trait >:: PlaylistId ,
2395- SeriesId = <T as Trait >:: SeriesId ,
2396- PersonId = <T as Trait >:: PersonId ,
2397- ChannelOwnershipTransferRequest = ChannelOwnershipTransferRequest <T >,
2398- Series = Series <<T as storage:: Trait >:: ChannelId , <T as Trait >:: VideoId >,
2399- Channel = Channel <T >,
2400- DataObjectId = DataObjectId <T >,
2401- IsCensored = bool ,
2402- AuctionParams = AuctionParams <
2403- <T as frame_system:: Trait >:: BlockNumber ,
2404- CurrencyOf <T >,
2405- <T as common:: MembershipTypes >:: MemberId ,
2382+ <T as ContentActorAuthenticator >:: CuratorId ,
2383+ <T as common:: MembershipTypes >:: MemberId ,
24062384 >,
2407- InitTransactionalStatus = InitTransactionalStatus <T >,
2408- Balance = BalanceOf <T >,
2409- CurrencyAmount = CurrencyOf <T >,
2410- ChannelCreationParameters = ChannelCreationParameters <T >,
2411- ChannelUpdateParameters = ChannelUpdateParameters <T >,
2412- VideoCreationParameters = VideoCreationParameters <T >,
2413- VideoUpdateParameters = VideoUpdateParameters <T >,
2414- StorageAssets = StorageAssets <T >,
2415- VideoPost = VideoPost <T >,
2416- VideoPostId = <T as Trait >:: VideoPostId ,
2417- ReactionId = <T as Trait >:: ReactionId ,
2418- ModeratorSet = BTreeSet <<T as MembershipTypes >:: MemberId >,
2419- Hash = <T as frame_system:: Trait >:: Hash ,
2420- IsExtended = bool ,
2385+ MemberId = <T as common:: MembershipTypes >:: MemberId ,
2386+ CuratorGroupId = <T as ContentActorAuthenticator >:: CuratorGroupId ,
2387+ CuratorId = <T as ContentActorAuthenticator >:: CuratorId ,
2388+ VideoId = <T as Trait >:: VideoId ,
2389+ VideoCategoryId = <T as Trait >:: VideoCategoryId ,
2390+ ChannelId = <T as storage:: Trait >:: ChannelId ,
2391+ ChannelCategoryId = <T as Trait >:: ChannelCategoryId ,
2392+ ChannelOwnershipTransferRequestId = <T as Trait >:: ChannelOwnershipTransferRequestId ,
2393+ PlaylistId = <T as Trait >:: PlaylistId ,
2394+ SeriesId = <T as Trait >:: SeriesId ,
2395+ PersonId = <T as Trait >:: PersonId ,
2396+ ChannelOwnershipTransferRequest = ChannelOwnershipTransferRequest <T >,
2397+ Series = Series <<T as storage:: Trait >:: ChannelId , <T as Trait >:: VideoId >,
2398+ Channel = Channel <T >,
2399+ DataObjectId = DataObjectId <T >,
2400+ IsCensored = bool ,
2401+ AuctionParams = AuctionParams <
2402+ <T as frame_system:: Trait >:: BlockNumber ,
2403+ CurrencyOf <T >,
2404+ <T as common:: MembershipTypes >:: MemberId ,
2405+ >,
2406+ InitTransactionalStatus = InitTransactionalStatus <T >,
2407+ Balance = BalanceOf <T >,
2408+ CurrencyAmount = CurrencyOf <T >,
2409+ ChannelCreationParameters = ChannelCreationParameters <T >,
2410+ ChannelUpdateParameters = ChannelUpdateParameters <T >,
2411+ VideoCreationParameters = VideoCreationParameters <T >,
2412+ VideoUpdateParameters = VideoUpdateParameters <T >,
2413+ StorageAssets = StorageAssets <T >,
2414+ VideoPost = VideoPost <T >,
2415+ VideoPostId = <T as Trait >:: VideoPostId ,
2416+ ReactionId = <T as Trait >:: ReactionId ,
2417+ ModeratorSet = BTreeSet <<T as MembershipTypes >:: MemberId >,
2418+ Hash = <T as frame_system:: Trait >:: Hash ,
2419+ IsExtended = bool ,
24212420 {
24222421 // Curators
24232422 CuratorGroupCreated ( CuratorGroupId ) ,
0 commit comments