fixed format errors

runtime-modules/content/src/errors.rs

@@ -79,17 +79,17 @@ decl_error! {
         /// Auction for given video did not start
         AuctionDidNotStart,
 
-        /// NFT for given video id already exists
-        NFTAlreadyExists,
+        /// Nft for given video id already exists
+        NftAlreadyExists,
 
-        /// NFT for given video id does not exist
-        NFTDoesNotExist,
+        /// Nft for given video id does not exist
+        NftDoesNotExist,
 
         /// Overflow or underflow error happened
         OverflowOrUnderflowHappened,
 
         /// Given origin does not own nft
-        DoesNotOwnNFT,
+        DoesNotOwnNft,
 
         /// Royalty Upper Bound Exceeded
         RoyaltyUpperBoundExceeded,
@@ -139,10 +139,10 @@ decl_error! {
         /// Already active auction cannot be cancelled
         ActionHasBidsAlready,
 
-        /// Can not create auction for NFT, if auction have been already started or nft is locked for the transfer
+        /// Can not create auction for Nft, if auction have been already started or nft is locked for the transfer
         NftIsNotIdle,
 
-        /// No pending offers for given NFT
+        /// No pending offers for given Nft
         PendingOfferDoesNotExist,
 
         /// Creator royalty requires reward account to be set.
@@ -173,7 +173,7 @@ decl_error! {
         MemberProfileNotFound,
 
         /// Given video nft is not in buy now state
-        NFTNotInBuyNowState,
+        NftNotInBuyNowState,
 
         /// Auction type is not `Open`
         IsNotOpenAuctionType,
@@ -184,8 +184,8 @@ decl_error! {
         /// Bid lock duration is not expired
         BidLockDurationIsNotExpired,
 
-        /// NFT auction is already expired
-        NFTAuctionIsAlreadyExpired,
+        /// Nft auction is already expired
+        NftAuctionIsAlreadyExpired,
 
         /// Auction buy now is less then starting price
         BuyNowIsLessThenStartingPrice,

runtime-modules/content/src/lib.rs

@@ -736,7 +736,7 @@ decl_module! {
                 enable_comments: params.enable_comments,
                 video_post_id:  None,
                 /// Newly created video has no nft
-                nft_status: nft_status,
+                nft_status,
             };
 
             //
@@ -1318,7 +1318,7 @@ decl_module! {
             origin,
             actor: ContentActor<T::CuratorGroupId, T::CuratorId, T::MemberId>,
             video_id: T::VideoId,
-            params: NFTIssuanceParameters<T>
+            params: NftIssuanceParameters<T>
         ) {
 
             let sender = ensure_signed(origin)?;
@@ -1343,7 +1343,7 @@ decl_module! {
             // == MUTATION SAFE ==
             //
 
-            // Issue NFT
+            // Issue Nft
             let video = video.set_nft_status(nft_status);
 
             // Update the video
@@ -1440,7 +1440,7 @@ decl_module! {
             Self::deposit_event(RawEvent::AuctionCanceled(owner_id, video_id));
         }
 
-        /// Cancel NFT offer
+        /// Cancel Nft offer
         #[weight = 10_000_000] // TODO: adjust weight
         pub fn cancel_offer(
             origin,
@@ -1473,7 +1473,7 @@ decl_module! {
             Self::deposit_event(RawEvent::OfferCanceled(video_id, owner_id));
         }
 
-        /// Cancel NFT sell order
+        /// Cancel Nft sell order
         #[weight = 10_000_000] // TODO: adjust weight
         pub fn cancel_buy_now(
             origin,
@@ -1720,7 +1720,7 @@ decl_module! {
             Self::deposit_event(RawEvent::OpenAuctionBidAccepted(owner_id, video_id));
         }
 
-        /// Offer NFT
+        /// Offer Nft
         #[weight = 10_000_000] // TODO: adjust weight
         pub fn offer_nft(
             origin,
@@ -1756,7 +1756,7 @@ decl_module! {
             Self::deposit_event(RawEvent::OfferStarted(video_id, owner_id, to, price));
         }
 
-        /// Return NFT back to the original artist at no cost
+        /// Return Nft back to the original artist at no cost
         #[weight = 10_000_000] // TODO: adjust weight
         pub fn sling_nft_back(
             origin,
@@ -1781,7 +1781,7 @@ decl_module! {
             //
 
             // Set nft owner to ChannelOwner
-            let nft = nft.set_owner(NFTOwner::ChannelOwner);
+            let nft = nft.set_owner(NftOwner::ChannelOwner);
             let video = video.set_nft_status(nft);
 
             VideoById::<T>::insert(video_id, video);
@@ -1790,7 +1790,7 @@ decl_module! {
             Self::deposit_event(RawEvent::NftSlingedBackToTheOriginalArtist(video_id, owner_id));
         }
 
-        /// Accept incoming NFT offer
+        /// Accept incoming Nft offer
         #[weight = 10_000_000] // TODO: adjust weight
         pub fn accept_incoming_offer(
             origin,
@@ -1823,7 +1823,7 @@ decl_module! {
             Self::deposit_event(RawEvent::OfferAccepted(video_id));
         }
 
-        /// Sell NFT
+        /// Sell Nft
         #[weight = 10_000_000] // TODO: adjust weight
         pub fn sell_nft(
             origin,
@@ -1855,10 +1855,10 @@ decl_module! {
             VideoById::<T>::insert(video_id, video);
 
             // Trigger event
-            Self::deposit_event(RawEvent::NFTSellOrderMade(video_id, owner_id, price));
+            Self::deposit_event(RawEvent::NftSellOrderMade(video_id, owner_id, price));
         }
 
-        /// Buy NFT
+        /// Buy Nft
         #[weight = 10_000_000] // TODO: adjust weight
         pub fn buy_nft(
             origin,
@@ -1892,7 +1892,7 @@ decl_module! {
             VideoById::<T>::insert(video_id, video);
 
             // Trigger event
-            Self::deposit_event(RawEvent::NFTBought(video_id, participant_id));
+            Self::deposit_event(RawEvent::NftBought(video_id, participant_id));
         }
     }
 }
@@ -2078,7 +2078,7 @@ impl<T: Trait> Module<T> {
         video: &Video<T>,
         owned_nft: &Nft<T>,
     ) -> Result<T::AccountId, Error<T>> {
-        if let NFTOwner::Member(member_id) = owned_nft.owner {
+        if let NftOwner::Member(member_id) = owned_nft.owner {
             let membership = <membership::Module<T>>::ensure_membership(member_id)
                 .map_err(|_| Error::<T>::MemberProfileNotFound)?;
             Ok(membership.controller_account)
@@ -2117,19 +2117,19 @@ impl<T: Trait> Module<T> {
         }
     }
 
-    /// Construct the NFT that is intended to be issued
+    /// Construct the Nft that is intended to be issued
     pub fn construct_owned_nft(
-        issuance_params: &NFTIssuanceParameters<T>,
+        issuance_params: &NftIssuanceParameters<T>,
     ) -> Result<Nft<T>, DispatchError> {
         let transactional_status = Self::ensure_valid_init_transactional_status(
             &issuance_params.init_transactional_status,
         )?;
         // The content owner will be..
         let nft_owner = if let Some(to) = issuance_params.non_channel_owner.as_ref() {
-            NFTOwner::Member(to.clone())
+            NftOwner::Member(to.clone())
         } else {
             // if `to` set to None, actor issues to ChannelOwner
-            NFTOwner::ChannelOwner
+            NftOwner::ChannelOwner
         };
 
         // Enure royalty bounds satisfied, if provided
@@ -2334,7 +2334,7 @@ decl_event!(
         ChannelRewardUpdated(Balance, ChannelId),
         MaxRewardUpdated(Balance),
         MinCashoutUpdated(Balance),
-        // NFT auction
+        // Nft auction
         AuctionStarted(ContentActor, VideoId, AuctionParams),
         NftIssued(
             ContentActor,
@@ -2353,8 +2353,8 @@ decl_event!(
         OfferStarted(VideoId, ContentActor, MemberId, Option<CurrencyAmount>),
         OfferAccepted(VideoId),
         OfferCanceled(VideoId, ContentActor),
-        NFTSellOrderMade(VideoId, ContentActor, CurrencyAmount),
-        NFTBought(VideoId, MemberId),
+        NftSellOrderMade(VideoId, ContentActor, CurrencyAmount),
+        NftBought(VideoId, MemberId),
         BuyNowCanceled(VideoId, ContentActor),
         NftSlingedBackToTheOriginalArtist(VideoId, ContentActor),
     }

runtime-modules/content/src/nft/mod.rs

@@ -224,7 +224,7 @@ impl<T: Trait> Module<T> {
         if let TransactionalStatus::<T>::BuyNow(price) = &nft.transactional_status {
             Self::ensure_sufficient_free_balance(participant_account_id, *price)
         } else {
-            Err(Error::<T>::NFTNotInBuyNowState.into())
+            Err(Error::<T>::NftNotInBuyNowState.into())
         }
     }
 
@@ -248,7 +248,7 @@ impl<T: Trait> Module<T> {
         }
     }
 
-    /// Cancel NFT transaction
+    /// Cancel Nft transaction
     pub fn cancel_transaction(nft: Nft<T>) -> Nft<T> {
         if let TransactionalStatus::<T>::Auction(ref auction) = nft.transactional_status {
             if let Some(ref last_bid) = auction.last_bid {
@@ -278,7 +278,7 @@ impl<T: Trait> Module<T> {
                 false,
             );
 
-            nft.owner = NFTOwner::Member(new_owner);
+            nft.owner = NftOwner::Member(new_owner);
         }
 
         nft.set_idle_transactional_status()
@@ -305,7 +305,7 @@ impl<T: Trait> Module<T> {
                 );
             }
 
-            nft.owner = NFTOwner::Member(*to);
+            nft.owner = NftOwner::Member(*to);
         }
 
         nft.set_idle_transactional_status()
@@ -352,11 +352,9 @@ impl<T: Trait> Module<T> {
                 // Deposit royalty into creator account
                 T::Currency::deposit_creating(&creator_account_id, royalty);
             }
-        } else {
-            if let Some(receiver_account_id) = receiver_account_id {
-                // Deposit amount, exluding auction fee into receiver account
-                T::Currency::deposit_creating(&receiver_account_id, amount - auction_fee);
-            }
+        } else if let Some(receiver_account_id) = receiver_account_id {
+            // Deposit amount, exluding auction fee into receiver account
+            T::Currency::deposit_creating(&receiver_account_id, amount - auction_fee);
         }
     }
 
@@ -380,7 +378,7 @@ impl<T: Trait> Module<T> {
             true,
         );
 
-        nft.owner = NFTOwner::Member(last_bidder);
+        nft.owner = NftOwner::Member(last_bidder);
         nft.transactional_status = TransactionalStatus::<T>::Idle;
         nft
     }

runtime-modules/content/src/nft/types.rs

@@ -1,12 +1,12 @@
 use super::*;
 
-/// Metadata for NFT issuance
+/// Metadata for Nft issuance
 pub type Metadata = Vec<u8>;
 
 /// Owner royalty
 pub type Royalty = Perbill;
 
-/// NFT transactional status
+/// Nft transactional status
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)]
 pub enum TransactionalStatusRecord<
@@ -40,16 +40,16 @@ pub type TransactionalStatus<T> = TransactionalStatusRecord<
     CurrencyOf<T>,
 >;
 
-/// Owned NFT representation
+/// Owned Nft representation
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)]
-pub struct OwnedNFT<
+pub struct OwnedNft<
     BlockNumber: BaseArithmetic + Copy + Default,
     MemberId: Default + Copy + Ord,
     AccountId: Default + Clone + Ord,
     Balance: Default + Clone + BaseArithmetic,
 > {
-    pub owner: NFTOwner<MemberId>,
+    pub owner: NftOwner<MemberId>,
     pub transactional_status: TransactionalStatusRecord<BlockNumber, MemberId, AccountId, Balance>,
     pub creator_royalty: Option<Royalty>,
 }
@@ -59,11 +59,11 @@ impl<
         MemberId: Default + Copy + PartialEq + Ord,
         AccountId: Default + Clone + PartialEq + Ord,
         Balance: Default + Clone + BaseArithmetic,
-    > OwnedNFT<BlockNumber, MemberId, AccountId, Balance>
+    > OwnedNft<BlockNumber, MemberId, AccountId, Balance>
 {
-    /// Create new NFT
+    /// Create new Nft
     pub fn new(
-        owner: NFTOwner<MemberId>,
+        owner: NftOwner<MemberId>,
         creator_royalty: Option<Royalty>,
         transactional_status: TransactionalStatusRecord<BlockNumber, MemberId, AccountId, Balance>,
     ) -> Self {
@@ -75,7 +75,7 @@ impl<
     }
 
     /// Set nft owner
-    pub fn set_owner(mut self, owner: NFTOwner<MemberId>) -> Self {
+    pub fn set_owner(mut self, owner: NftOwner<MemberId>) -> Self {
         self.owner = owner;
         self
     }
@@ -131,7 +131,7 @@ impl<
         self
     }
 
-    /// Ensure NFT has pending offer
+    /// Ensure Nft has pending offer
     pub fn ensure_pending_offer_state<T: Trait>(&self) -> DispatchResult {
         ensure!(
             matches!(
@@ -143,14 +143,14 @@ impl<
         Ok(())
     }
 
-    /// Ensure NFT is in BuyNow state
+    /// Ensure Nft is in BuyNow state
     pub fn ensure_buy_now_state<T: Trait>(&self) -> DispatchResult {
         ensure!(
             matches!(
                 self.transactional_status,
                 TransactionalStatusRecord::BuyNow(..),
             ),
-            Error::<T>::NFTNotInBuyNowState
+            Error::<T>::NftNotInBuyNowState
         );
         Ok(())
     }
@@ -158,12 +158,12 @@ impl<
 
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)]
-pub enum NFTOwner<MemberId> {
+pub enum NftOwner<MemberId> {
     ChannelOwner,
     Member(MemberId),
 }
 
-impl<MemberId> Default for NFTOwner<MemberId> {
+impl<MemberId> Default for NftOwner<MemberId> {
     fn default() -> Self {
         Self::ChannelOwner
     }
@@ -353,7 +353,7 @@ impl<
     ) -> DispatchResult {
         ensure!(
             !self.is_nft_auction_expired(current_block),
-            Error::<T>::NFTAuctionIsAlreadyExpired
+            Error::<T>::NftAuctionIsAlreadyExpired
         );
         Ok(())
     }
@@ -452,8 +452,8 @@ pub type Auction<T> = AuctionRecord<
     <T as frame_system::Trait>::AccountId,
 >;
 
-/// OwnedNFT alias type for simplification.
-pub type Nft<T> = OwnedNFT<
+/// OwnedNft alias type for simplification.
+pub type Nft<T> = OwnedNft<
     <T as frame_system::Trait>::BlockNumber,
     <T as common::MembershipTypes>::MemberId,
     <T as frame_system::Trait>::AccountId,
@@ -511,23 +511,23 @@ pub struct OpenAuctionDetails<BlockNumber> {
 /// Parameters used to issue a nft
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)]
-pub struct NFTIssuanceParametersRecord<MemberId, InitTransactionalStatus> {
+pub struct NftIssuanceParametersRecord<MemberId, InitTransactionalStatus> {
     /// Roayalty used for the author
     pub royalty: Option<Royalty>,
     /// Metadata
     pub nft_metadata: Metadata,
-    /// member id NFT will be issued to
+    /// member id Nft will be issued to
     pub non_channel_owner: Option<MemberId>,
     /// Initial transactional status for the nft
     pub init_transactional_status: InitTransactionalStatus,
 }
 
-pub type NFTIssuanceParameters<T> = NFTIssuanceParametersRecord<
+pub type NftIssuanceParameters<T> = NftIssuanceParametersRecord<
     <T as common::MembershipTypes>::MemberId,
     InitTransactionalStatus<T>,
 >;
 
-/// Initial Transactional status for the NFT: See InitialTransactionalStatusRecord above
+/// Initial Transactional status for the Nft: See InitialTransactionalStatusRecord above
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)]
 pub enum InitTransactionalStatusRecord<

runtime-modules/content/src/permissions/mod.rs

@@ -257,13 +257,13 @@ pub fn ensure_actor_is_channel_owner<T: Trait>(
 pub fn ensure_actor_authorized_to_manage_nft<T: Trait>(
     origin: T::Origin,
     actor: &ContentActor<T::CuratorGroupId, T::CuratorId, T::MemberId>,
-    nft_owner: &NFTOwner<T::MemberId>,
+    nft_owner: &NftOwner<T::MemberId>,
     in_channel: T::ChannelId,
 ) -> DispatchResult {
     let sender = ensure_signed(origin)?;
     ensure_actor_auth_success::<T>(&sender, actor)?;
 
-    if let NFTOwner::Member(member_id) = nft_owner {
+    if let NftOwner::Member(member_id) = nft_owner {
         ensure!(
             *actor == ContentActor::Member(*member_id),
             Error::<T>::ActorNotAuthorized

runtime-modules/content/src/tests/nft/accept_incoming_offer.rs

@@ -23,7 +23,7 @@ fn accept_incoming_offer() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft
@@ -51,8 +51,8 @@ fn accept_incoming_offer() {
         // Ensure nft offer accepted succesfully
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
-                owner: NFTOwner::Member(member_id),
+            Some(OwnedNft {
+                owner: NftOwner::Member(member_id),
                 transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             }) if member_id == SECOND_MEMBER_ID
@@ -102,7 +102,7 @@ fn accept_incoming_offer_nft_not_issued() {
             Content::accept_incoming_offer(Origin::signed(SECOND_MEMBER_ACCOUNT_ID), video_id);
 
         // Failure checked
-        assert_err!(accept_incoming_offer_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(accept_incoming_offer_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -122,7 +122,7 @@ fn accept_incoming_offer_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft
@@ -164,7 +164,7 @@ fn accept_incoming_offer_no_incoming_offers() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to accept incoming nft offer if there is no incoming transfers
@@ -201,7 +201,7 @@ fn accept_incoming_offer_reward_account_is_not_set() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft
@@ -241,7 +241,7 @@ fn accept_incoming_offer_insufficient_balance() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft

runtime-modules/content/src/tests/nft/buy_nft.rs

@@ -26,7 +26,7 @@ fn buy_nft() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // deposit balance to second member
@@ -72,8 +72,8 @@ fn buy_nft() {
         // Ensure nft succesfully bought
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
-                owner: NFTOwner::Member(SECOND_MEMBER_ID),
+            Some(OwnedNft {
+                owner: NftOwner::Member(SECOND_MEMBER_ID),
                 transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
@@ -81,7 +81,7 @@ fn buy_nft() {
 
         // Last event checked
         assert_event(
-            MetaEvent::content(RawEvent::NFTBought(video_id, SECOND_MEMBER_ID)),
+            MetaEvent::content(RawEvent::NftBought(video_id, SECOND_MEMBER_ID)),
             number_of_events_before_call + 1,
         );
     })
@@ -134,7 +134,7 @@ fn buy_nft_not_issued() {
         );
 
         // Failure checked
-        assert_err!(buy_nft_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(buy_nft_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -156,7 +156,7 @@ fn buy_nft_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Sell nft
@@ -196,7 +196,7 @@ fn buy_nft_not_in_buy_now_state() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to buy nft which is not in BuyNow state
@@ -207,7 +207,7 @@ fn buy_nft_not_in_buy_now_state() {
         );
 
         // Failure checked
-        assert_err!(buy_nft_result, Error::<Test>::NFTNotInBuyNowState);
+        assert_err!(buy_nft_result, Error::<Test>::NftNotInBuyNowState);
     })
 }
 
@@ -227,7 +227,7 @@ fn buy_nft_insufficient_balance() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Sell nft
@@ -273,7 +273,7 @@ fn buy_nft_reward_account_is_not_set() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // deposit balance to second member

runtime-modules/content/src/tests/nft/cancel_buy_now.rs

@@ -24,7 +24,7 @@ fn cancel_buy_now() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         increase_account_balance_helper(SECOND_MEMBER_ACCOUNT_ID, DEFAULT_NFT_PRICE);
@@ -54,7 +54,7 @@ fn cancel_buy_now() {
         // Ensure nft status changed to given Auction
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
@@ -111,7 +111,7 @@ fn cancel_buy_now_not_issued() {
         );
 
         // Failure checked
-        assert_err!(cancel_buy_now_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(cancel_buy_now_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -132,7 +132,7 @@ fn cancel_buy_now_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Sell nft
@@ -172,7 +172,7 @@ fn cancel_buy_now_not_authorized() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Sell nft
@@ -212,7 +212,7 @@ fn cancel_buy_now_not_in_auction_state() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to cancel buy now if there is no pending one
@@ -223,6 +223,6 @@ fn cancel_buy_now_not_in_auction_state() {
         );
 
         // Failure checked
-        assert_err!(cancel_buy_now_result, Error::<Test>::NFTNotInBuyNowState);
+        assert_err!(cancel_buy_now_result, Error::<Test>::NftNotInBuyNowState);
     })
 }

runtime-modules/content/src/tests/nft/cancel_nft_auction.rs

@@ -24,7 +24,7 @@ fn cancel_nft_auction() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Start nft auction
@@ -52,7 +52,7 @@ fn cancel_nft_auction() {
         // Ensure nft status changed to given Auction
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
@@ -109,7 +109,7 @@ fn cancel_nft_auction_not_issued() {
         );
 
         // Failure checked
-        assert_err!(cancel_nft_auction_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(cancel_nft_auction_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -130,7 +130,7 @@ fn cancel_nft_auction_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Start nft auction
@@ -170,7 +170,7 @@ fn cancel_nft_auction_not_authorized() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Start nft auction
@@ -210,7 +210,7 @@ fn cancel_nft_auction_not_in_auction_state() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to cancel nft auction if there is no pending one
@@ -242,7 +242,7 @@ fn cancel_nft_auction_english_auction_with_bids() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {

runtime-modules/content/src/tests/nft/cancel_offer.rs

@@ -24,7 +24,7 @@ fn cancel_offer() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft
@@ -53,7 +53,7 @@ fn cancel_offer() {
         // Ensure nft status changed to given Auction
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
@@ -110,7 +110,7 @@ fn cancel_offer_not_issued() {
         );
 
         // Failure checked
-        assert_err!(cancel_offer_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(cancel_offer_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -131,7 +131,7 @@ fn cancel_offer_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft
@@ -172,7 +172,7 @@ fn cancel_offer_not_authorized() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft
@@ -213,7 +213,7 @@ fn cancel_offer_not_in_auction_state() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to cancel offer if there is no pending one

runtime-modules/content/src/tests/nft/cancel_open_auction_bid.rs

@@ -24,7 +24,7 @@ fn cancel_open_auction_bid() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();
@@ -79,7 +79,7 @@ fn cancel_open_auction_bid() {
         // Ensure bid on specific auction successfully canceled
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::Auction(auction_without_bid,),
                 ..
             }) if auction_without_bid.last_bid.is_none()
@@ -110,7 +110,7 @@ fn cancel_open_auction_bid_lock_duration_did_not_expire() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();
@@ -177,7 +177,7 @@ fn cancel_open_auction_bid_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();
@@ -275,7 +275,7 @@ fn cancel_open_auction_bid_nft_is_not_issued() {
         // Failure checked
         assert_err!(
             cancel_open_auction_bid_result,
-            Error::<Test>::NFTDoesNotExist
+            Error::<Test>::NftDoesNotExist
         );
     })
 }
@@ -297,7 +297,7 @@ fn cancel_open_auction_bid_not_in_auction_state() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to cancel open auction bid for nft which is not in auction state
@@ -332,7 +332,7 @@ fn cancel_open_auction_bid_is_not_open_auction_type() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {
@@ -400,7 +400,7 @@ fn cancel_open_auction_bid_last_bid_does_not_exist() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();
@@ -457,7 +457,7 @@ fn cancel_open_auction_bid_actor_is_not_a_last_bidder() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();

runtime-modules/content/src/tests/nft/claim_won_english_auction.rs

@@ -24,7 +24,7 @@ fn claim_won_english_auction() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {
@@ -80,7 +80,7 @@ fn claim_won_english_auction() {
         // Ensure english auction successfully completed
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
@@ -114,7 +114,7 @@ fn claim_won_english_auction_cannot_be_completed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {
@@ -182,7 +182,7 @@ fn claim_won_english_auction_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {
@@ -281,7 +281,7 @@ fn claim_won_english_auction_nft_is_not_issued() {
         // Failure checked
         assert_err!(
             claim_won_english_auction_result,
-            Error::<Test>::NFTDoesNotExist
+            Error::<Test>::NftDoesNotExist
         );
     })
 }
@@ -303,7 +303,7 @@ fn claim_won_english_auction_not_in_auction_state() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to claim won english auction for nft which is not in auction state
@@ -338,7 +338,7 @@ fn claim_won_english_auction_is_not_english_auction_type() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();
@@ -405,7 +405,7 @@ fn claim_won_english_auction_last_bid_does_not_exist() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {

runtime-modules/content/src/tests/nft/issue_nft.rs

@@ -32,21 +32,21 @@ fn issue_nft() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Runtime tested state after call
 
         // Ensure nft created succesfully
-        let nft_status = Some(OwnedNFT::new(
-            NFTOwner::ChannelOwner,
+        let nft_status = Some(OwnedNft::new(
+            NftOwner::ChannelOwner,
             None,
             TransactionalStatus::<Test>::Idle,
         ));
         assert_eq!(nft_status, Content::video_by_id(video_id).nft_status);
 
         // Last event checked
-        let nft_issue_params = NFTIssuanceParameters::<Test>::default();
+        let nft_issue_params = NftIssuanceParameters::<Test>::default();
         assert_event(
             MetaEvent::content(RawEvent::NftIssued(
                 ContentActor::Member(DEFAULT_MEMBER_ID),
@@ -74,7 +74,7 @@ fn issue_nft_video_does_not_exist() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         );
 
         // Failure checked
@@ -99,7 +99,7 @@ fn issue_nft_already_issued() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to issue nft once again for the same video
@@ -107,11 +107,11 @@ fn issue_nft_already_issued() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         );
 
         // Failure checked
-        assert_err!(issue_nft_result, Error::<Test>::NFTAlreadyExists);
+        assert_err!(issue_nft_result, Error::<Test>::NftAlreadyExists);
     })
 }
 
@@ -132,7 +132,7 @@ fn issue_nft_auth_failed() {
             Origin::signed(UNAUTHORIZED_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         );
 
         // Failure checked
@@ -157,7 +157,7 @@ fn issue_nft_actor_not_authorized() {
             Origin::signed(UNAUTHORIZED_MEMBER_ACCOUNT_ID),
             ContentActor::Member(UNAUTHORIZED_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         );
 
         // Failure checked
@@ -182,9 +182,9 @@ fn issue_nft_royalty_bounds_violated() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test> {
+            NftIssuanceParameters::<Test> {
                 royalty: Some(Perbill::one()),
-                ..NFTIssuanceParameters::<Test>::default()
+                ..NftIssuanceParameters::<Test>::default()
             },
         );
 
@@ -196,9 +196,9 @@ fn issue_nft_royalty_bounds_violated() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test> {
+            NftIssuanceParameters::<Test> {
                 royalty: Some(Perbill::from_perthousand(1)),
-                ..NFTIssuanceParameters::<Test>::default()
+                ..NftIssuanceParameters::<Test>::default()
             },
         );
 
@@ -235,9 +235,9 @@ fn issue_nft_fails_with_invalid_auction_parameters() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test> {
+            NftIssuanceParameters::<Test> {
                 init_transactional_status: InitTransactionalStatus::<Test>::Auction(auction_params),
-                ..NFTIssuanceParameters::<Test>::default()
+                ..NftIssuanceParameters::<Test>::default()
             },
         );
 

runtime-modules/content/src/tests/nft/make_bid.rs

@@ -25,7 +25,7 @@ fn make_bid() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = get_open_auction_params();
@@ -75,7 +75,7 @@ fn make_bid() {
         // Ensure nft status changed to given Auction
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::Auction(auction_with_bid,),
                 ..
             }) if auction == auction_with_bid
@@ -111,7 +111,7 @@ fn make_bid_completes_auction() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let buy_now_price = Content::min_starting_price();
@@ -158,11 +158,11 @@ fn make_bid_completes_auction() {
         // Ensure nft status changed to given Auction
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::Idle,
                 owner,
                 ..
-            }) if owner == NFTOwner::Member(SECOND_MEMBER_ID)
+            }) if owner == NftOwner::Member(SECOND_MEMBER_ID)
         ));
 
         // Last event checked
@@ -193,7 +193,7 @@ fn make_bid_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = get_open_auction_params();
@@ -241,7 +241,7 @@ fn make_bid_insufficient_balance() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = get_open_auction_params();
@@ -321,7 +321,7 @@ fn make_bid_nft_is_not_issued() {
         );
 
         // Failure checked
-        assert_err!(make_bid_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(make_bid_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -342,7 +342,7 @@ fn make_bid_nft_is_not_in_auction_state() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // deposit initial balance
@@ -380,7 +380,7 @@ fn make_bid_nft_auction_expired() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {
@@ -420,7 +420,7 @@ fn make_bid_nft_auction_expired() {
         );
 
         // Failure checked
-        assert_err!(make_bid_result, Error::<Test>::NFTAuctionIsAlreadyExpired);
+        assert_err!(make_bid_result, Error::<Test>::NftAuctionIsAlreadyExpired);
     })
 }
 
@@ -441,7 +441,7 @@ fn make_bid_nft_auction_is_not_started() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let starting_price = Content::min_starting_price();
@@ -498,7 +498,7 @@ fn make_bid_member_is_not_allowed_to_participate() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {
@@ -563,7 +563,7 @@ fn make_bid_starting_price_constraint_violated() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {
@@ -622,7 +622,7 @@ fn make_bid_bid_step_constraint_violated() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {

runtime-modules/content/src/tests/nft/offer_nft.rs

@@ -24,7 +24,7 @@ fn offer_nft() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Runtime tested state before call
@@ -46,7 +46,7 @@ fn offer_nft() {
         // Ensure nft offered succesfully
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::InitiatedOfferToMember(
                     SECOND_MEMBER_ID,
                     None
@@ -112,7 +112,7 @@ fn offer_nft_not_issued() {
         );
 
         // Failure checked
-        assert_err!(offer_nft_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(offer_nft_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -133,7 +133,7 @@ fn offer_nft_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to offer nft with wrong credentials
@@ -167,7 +167,7 @@ fn offer_nft_not_authorized() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to offer nft if actor is not authorized
@@ -201,7 +201,7 @@ fn offer_nft_transactional_status_is_not_idle() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft

runtime-modules/content/src/tests/nft/pick_open_auction_winner.rs

@@ -24,7 +24,7 @@ fn pick_open_auction_winner() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();
@@ -76,7 +76,7 @@ fn pick_open_auction_winner() {
         // Ensure english auction successfully completed
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
@@ -110,7 +110,7 @@ fn pick_open_auction_winner_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();
@@ -180,7 +180,7 @@ fn pick_open_auction_winner_actor_not_authorized() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();
@@ -278,7 +278,7 @@ fn pick_open_auction_winner_nft_is_not_issued() {
         // Failure checked
         assert_err!(
             pick_open_auction_winner_result,
-            Error::<Test>::NFTDoesNotExist
+            Error::<Test>::NftDoesNotExist
         );
     })
 }
@@ -300,7 +300,7 @@ fn pick_open_auction_winner_not_in_auction_state() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to pick open auction winner for nft which is not in auction state
@@ -335,7 +335,7 @@ fn pick_open_auction_winner_is_not_open_auction_type() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = AuctionParams {
@@ -403,7 +403,7 @@ fn pick_open_auction_winner_last_bid_does_not_exist() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let bid_lock_duration = Content::min_bid_lock_duration();

runtime-modules/content/src/tests/nft/sell_nft.rs

@@ -24,7 +24,7 @@ fn sell_nft() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Runtime tested state before call
@@ -45,7 +45,7 @@ fn sell_nft() {
         // Ensure nft offer made succesfully
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::BuyNow(
                     cost,
                 ),
@@ -55,7 +55,7 @@ fn sell_nft() {
 
         // Last event checked
         assert_event(
-            MetaEvent::content(RawEvent::NFTSellOrderMade(
+            MetaEvent::content(RawEvent::NftSellOrderMade(
                 video_id,
                 ContentActor::Member(DEFAULT_MEMBER_ID),
                 DEFAULT_NFT_PRICE,
@@ -107,7 +107,7 @@ fn sell_nft_not_issued() {
         );
 
         // Failure checked
-        assert_err!(sell_nft_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(sell_nft_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -128,7 +128,7 @@ fn sell_nft_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to sell nft with wrong credentials
@@ -161,7 +161,7 @@ fn sell_nft_not_authorized() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to sell nft if actor is not authorized
@@ -194,7 +194,7 @@ fn sell_nft_transactional_status_is_not_idle() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft

runtime-modules/content/src/tests/nft/sling_nft_back.rs

@@ -24,17 +24,17 @@ fn sling_nft_back() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test> {
+            NftIssuanceParameters::<Test> {
                 non_channel_owner: Some(SECOND_MEMBER_ID),
-                ..NFTIssuanceParameters::<Test>::default()
+                ..NftIssuanceParameters::<Test>::default()
             }
         ));
 
         // Runtime tested state before call
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
-                owner: NFTOwner::Member(SECOND_MEMBER_ID),
+            Some(OwnedNft {
+                owner: NftOwner::Member(SECOND_MEMBER_ID),
                 ..
             })
         ));
@@ -54,8 +54,8 @@ fn sling_nft_back() {
         // Ensure nft slinged back successfully
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
-                owner: NFTOwner::ChannelOwner,
+            Some(OwnedNft {
+                owner: NftOwner::ChannelOwner,
                 ..
             })
         ));
@@ -111,7 +111,7 @@ fn sling_nft_back_not_issued() {
         );
 
         // Failure checked
-        assert_err!(sling_nft_back_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(sling_nft_back_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -132,7 +132,7 @@ fn sling_nft_back_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to sling nft back with wrong credentials
@@ -164,7 +164,7 @@ fn sling_nft_back_not_authorized() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to sling nft back if actor is not authorized
@@ -196,7 +196,7 @@ fn sling_nft_back_transactional_status_is_not_idle() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft

runtime-modules/content/src/tests/nft/start_nft_auction.rs

@@ -25,7 +25,7 @@ fn start_nft_auction() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Runtime tested state before call
@@ -54,7 +54,7 @@ fn start_nft_auction() {
         // Ensure nft status changed to given Auction
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
-            Some(OwnedNFT {
+            Some(OwnedNft {
                 transactional_status: TransactionalStatus::<Test>::Auction(created_auction,),
                 ..
             }) if auction == created_auction
@@ -118,7 +118,7 @@ fn start_nft_auction_not_issued() {
         );
 
         // Failure checked
-        assert_err!(start_nft_auction_result, Error::<Test>::NFTDoesNotExist);
+        assert_err!(start_nft_auction_result, Error::<Test>::NftDoesNotExist);
     })
 }
 
@@ -139,7 +139,7 @@ fn start_nft_auction_auth_failed() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = get_open_auction_params();
@@ -174,7 +174,7 @@ fn start_nft_auction_not_authorized() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         let auction_params = get_open_auction_params();
@@ -209,7 +209,7 @@ fn start_nft_auction_transactional_status_is_not_idle() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Offer nft
@@ -253,7 +253,7 @@ fn start_nft_auction_invalid_params() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to start nft auction if starting price provided is less then min starting price

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

@@ -21,7 +21,7 @@ fn delete_video_nft_is_issued() {
             Origin::signed(DEFAULT_MEMBER_ACCOUNT_ID),
             ContentActor::Member(DEFAULT_MEMBER_ID),
             video_id,
-            NFTIssuanceParameters::<Test>::default(),
+            NftIssuanceParameters::<Test>::default(),
         ));
 
         // Make an attempt to delete a video, which has an nft issued already.
@@ -32,7 +32,7 @@ fn delete_video_nft_is_issued() {
                 video_id,
                 BTreeSet::new(),
             ),
-            Error::<Test>::NFTAlreadyExists
+            Error::<Test>::NftAlreadyExists
         );
     })
 }

runtime-modules/content/src/types.rs

@@ -221,19 +221,19 @@ pub type StorageAssets<T> = StorageAssetsRecord<BalanceOf<T>>;
 /// Information about the video being created.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Encode, Decode, Clone, PartialEq, Eq, Debug)]
-pub struct VideoCreationParametersRecord<StorageAssets, NFTIssuanceParameters> {
+pub struct VideoCreationParametersRecord<StorageAssets, NftIssuanceParameters> {
     /// Asset collection for the video
     pub assets: Option<StorageAssets>,
     /// Metadata for the video.
     pub meta: Option<Vec<u8>>,
     /// Comments enabled or not
     pub enable_comments: bool,
-    /// Parameters for issuing video NFT
-    pub auto_issue_nft: Option<NFTIssuanceParameters>,
+    /// Parameters for issuing video Nft
+    pub auto_issue_nft: Option<NftIssuanceParameters>,
 }
 
 pub type VideoCreationParameters<T> =
-    VideoCreationParametersRecord<StorageAssets<T>, NFTIssuanceParameters<T>>;
+    VideoCreationParametersRecord<StorageAssets<T>, NftIssuanceParameters<T>>;
 
 /// Information about the video being updated
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
@@ -254,7 +254,7 @@ pub type VideoUpdateParameters<T> = VideoUpdateParametersRecord<StorageAssets<T>
 /// A video which belongs to a channel. A video may be part of a series or playlist.
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 #[derive(Encode, Decode, Default, Clone, PartialEq, Eq, Debug)]
-pub struct VideoRecord<ChannelId, VideoPostId, OwnedNFT> {
+pub struct VideoRecord<ChannelId, VideoPostId, OwnedNft> {
     /// channel the video is in
     pub in_channel: ChannelId,
     /// Whether the curators have censored the video or not.
@@ -264,7 +264,7 @@ pub struct VideoRecord<ChannelId, VideoPostId, OwnedNFT> {
     /// First post to a video works as a description
     pub video_post_id: Option<VideoPostId>,
     /// Whether nft for this video have been issued.
-    pub nft_status: Option<OwnedNFT>,
+    pub nft_status: Option<OwnedNft>,
 }
 
 pub type Video<T> =
@@ -406,26 +406,26 @@ pub type PullPayment<T> = PullPaymentElement<
     <T as frame_system::Trait>::Hash,
 >;
 
-impl<ChannelId: Clone, VideoPostId: Clone, OwnedNFT: Clone>
-    VideoRecord<ChannelId, VideoPostId, OwnedNFT>
+impl<ChannelId: Clone, VideoPostId: Clone, OwnedNft: Clone>
+    VideoRecord<ChannelId, VideoPostId, OwnedNft>
 {
     /// Ensure nft is not issued
     pub fn ensure_nft_is_not_issued<T: Trait>(&self) -> DispatchResult {
-        ensure!(self.nft_status.is_none(), Error::<T>::NFTAlreadyExists);
+        ensure!(self.nft_status.is_none(), Error::<T>::NftAlreadyExists);
         Ok(())
     }
 
     /// Ensure nft is issued
-    pub fn ensure_nft_is_issued<T: Trait>(&self) -> Result<OwnedNFT, Error<T>> {
+    pub fn ensure_nft_is_issued<T: Trait>(&self) -> Result<OwnedNft, Error<T>> {
         if let Some(owned_nft) = &self.nft_status {
             Ok(owned_nft.clone())
         } else {
-            Err(Error::<T>::NFTDoesNotExist)
+            Err(Error::<T>::NftDoesNotExist)
         }
     }
 
     /// Set video nft status
-    pub fn set_nft_status(mut self, nft: OwnedNFT) -> Self {
+    pub fn set_nft_status(mut self, nft: OwnedNft) -> Self {
         self.nft_status = Some(nft);
         self
     }