Browse Source

fixed test for the new TransactionalStatus alias

ignazio 3 years ago
parent
commit
0752c9cfa2

+ 8 - 6
runtime-modules/content/src/nft/mod.rs

@@ -221,7 +221,7 @@ impl<T: Trait> Module<T> {
         nft: &Nft<T>,
         participant_account_id: &T::AccountId,
     ) -> DispatchResult {
-        if let TransactionalStatus::BuyNow(price) = &nft.transactional_status {
+        if let TransactionalStatus::<T>::BuyNow(price) = &nft.transactional_status {
             Self::ensure_sufficient_free_balance(participant_account_id, *price)
         } else {
             Err(Error::<T>::NFTNotInBuyNowState.into())
@@ -233,7 +233,7 @@ impl<T: Trait> Module<T> {
         nft: &Nft<T>,
         participant_account_id: &T::AccountId,
     ) -> DispatchResult {
-        if let TransactionalStatus::InitiatedOfferToMember(member_id, price) =
+        if let TransactionalStatus::<T>::InitiatedOfferToMember(member_id, price) =
             &nft.transactional_status
         {
             // Authorize participant under given member id
@@ -250,7 +250,7 @@ impl<T: Trait> Module<T> {
 
     /// Cancel NFT transaction
     pub fn cancel_transaction(nft: Nft<T>) -> Nft<T> {
-        if let TransactionalStatus::Auction(ref auction) = nft.transactional_status {
+        if let TransactionalStatus::<T>::Auction(ref auction) = nft.transactional_status {
             if let Some(ref last_bid) = auction.last_bid {
                 // Unreserve previous bidder balance
                 T::Currency::unreserve(&last_bid.bidder_account_id, last_bid.amount);
@@ -268,7 +268,7 @@ impl<T: Trait> Module<T> {
         new_owner_account_id: T::AccountId,
         new_owner: T::MemberId,
     ) -> Nft<T> {
-        if let TransactionalStatus::BuyNow(price) = &nft.transactional_status {
+        if let TransactionalStatus::<T>::BuyNow(price) = &nft.transactional_status {
             Self::complete_payment(
                 in_channel,
                 nft.creator_royalty,
@@ -291,7 +291,9 @@ impl<T: Trait> Module<T> {
         owner_account_id: T::AccountId,
         new_owner_account_id: T::AccountId,
     ) -> Nft<T> {
-        if let TransactionalStatus::InitiatedOfferToMember(to, price) = &nft.transactional_status {
+        if let TransactionalStatus::<T>::InitiatedOfferToMember(to, price) =
+            &nft.transactional_status
+        {
             if let Some(price) = price {
                 Self::complete_payment(
                     in_channel,
@@ -379,7 +381,7 @@ impl<T: Trait> Module<T> {
         );
 
         nft.owner = NFTOwner::Member(last_bidder);
-        nft.transactional_status = TransactionalStatus::Idle;
+        nft.transactional_status = TransactionalStatus::<T>::Idle;
         nft
     }
 }

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

@@ -84,7 +84,7 @@ impl<
     pub fn ensure_auction_state<T: Trait>(
         &self,
     ) -> Result<AuctionRecord<BlockNumber, Balance, MemberId, AccountId>, Error<T>> {
-        if let TransactionalStatus::<T>::Auction(auction) = &self.transactional_status {
+        if let TransactionalStatusRecord::Auction(auction) = &self.transactional_status {
             Ok(auction.to_owned())
         } else {
             Err(Error::<T>::NotInAuctionState)
@@ -93,7 +93,7 @@ impl<
 
     ///  Ensure nft transactional status is set to `Idle`
     pub fn ensure_nft_transactional_status_is_idle<T: Trait>(&self) -> DispatchResult {
-        if let TransactionalStatus::<T>::Idle = self.transactional_status {
+        if let TransactionalStatusRecord::Idle = self.transactional_status {
             Ok(())
         } else {
             Err(Error::<T>::NftIsNotIdle.into())
@@ -102,7 +102,7 @@ impl<
 
     /// Sets nft transactional status to `BuyNow`
     pub fn set_buy_now_transactionl_status(mut self, buy_now_price: Balance) -> Self {
-        self.transactional_status = TransactionalStatus::<T>::BuyNow(buy_now_price);
+        self.transactional_status = TransactionalStatusRecord::BuyNow(buy_now_price);
         self
     }
 
@@ -111,13 +111,13 @@ impl<
         mut self,
         auction: AuctionRecord<BlockNumber, Balance, MemberId, AccountId>,
     ) -> Self {
-        self.transactional_status = TransactionalStatus::<T>::Auction(auction);
+        self.transactional_status = TransactionalStatusRecord::Auction(auction);
         self
     }
 
     /// Set nft transactional status to `Idle`
     pub fn set_idle_transactional_status(mut self) -> Self {
-        self.transactional_status = TransactionalStatus::<T>::Idle;
+        self.transactional_status = TransactionalStatusRecord::Idle;
         self
     }
 
@@ -127,7 +127,7 @@ impl<
         to: MemberId,
         balance: Option<Balance>,
     ) -> Self {
-        self.transactional_status = TransactionalStatus::<T>::InitiatedOfferToMember(to, balance);
+        self.transactional_status = TransactionalStatusRecord::InitiatedOfferToMember(to, balance);
         self
     }
 
@@ -136,7 +136,7 @@ impl<
         ensure!(
             matches!(
                 self.transactional_status,
-                TransactionalStatus::<T>::InitiatedOfferToMember(..),
+                TransactionalStatusRecord::InitiatedOfferToMember(..),
             ),
             Error::<T>::PendingOfferDoesNotExist
         );
@@ -148,7 +148,7 @@ impl<
         ensure!(
             matches!(
                 self.transactional_status,
-                TransactionalStatus::<T>::BuyNow(..),
+                TransactionalStatusRecord::BuyNow(..),
             ),
             Error::<T>::NFTNotInBuyNowState
         );

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

@@ -53,7 +53,7 @@ fn accept_incoming_offer() {
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
                 owner: NFTOwner::Member(member_id),
-                transactional_status: TransactionalStatus::Idle,
+                transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             }) if member_id == SECOND_MEMBER_ID
         ));

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

@@ -74,7 +74,7 @@ fn buy_nft() {
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
                 owner: NFTOwner::Member(SECOND_MEMBER_ID),
-                transactional_status: TransactionalStatus::Idle,
+                transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
         ));

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

@@ -55,7 +55,7 @@ fn cancel_buy_now() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::Idle,
+                transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
         ));

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

@@ -53,7 +53,7 @@ fn cancel_nft_auction() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::Idle,
+                transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
         ));

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

@@ -54,7 +54,7 @@ fn cancel_offer() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::Idle,
+                transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
         ));

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

@@ -80,7 +80,7 @@ fn cancel_open_auction_bid() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::Auction(auction_without_bid,),
+                transactional_status: TransactionalStatus::<Test>::Auction(auction_without_bid,),
                 ..
             }) if auction_without_bid.last_bid.is_none()
         ));

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

@@ -81,7 +81,7 @@ fn claim_won_english_auction() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::Idle,
+                transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
         ));

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

@@ -41,7 +41,7 @@ fn issue_nft() {
         let nft_status = Some(OwnedNFT::new(
             NFTOwner::ChannelOwner,
             None,
-            TransactionalStatus::Idle,
+            TransactionalStatus::<Test>::Idle,
         ));
         assert_eq!(nft_status, Content::video_by_id(video_id).nft_status);
 

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

@@ -76,7 +76,7 @@ fn make_bid() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::Auction(auction_with_bid,),
+                transactional_status: TransactionalStatus::<Test>::Auction(auction_with_bid,),
                 ..
             }) if auction == auction_with_bid
         ));
@@ -159,7 +159,7 @@ fn make_bid_completes_auction() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::Idle,
+                transactional_status: TransactionalStatus::<Test>::Idle,
                 owner,
                 ..
             }) if owner == NFTOwner::Member(SECOND_MEMBER_ID)

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

@@ -47,7 +47,7 @@ fn offer_nft() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::InitiatedOfferToMember(
+                transactional_status: TransactionalStatus::<Test>::InitiatedOfferToMember(
                     SECOND_MEMBER_ID,
                     None
                 ),

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

@@ -77,7 +77,7 @@ fn pick_open_auction_winner() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::Idle,
+                transactional_status: TransactionalStatus::<Test>::Idle,
                 ..
             })
         ));

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

@@ -46,7 +46,7 @@ fn sell_nft() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::BuyNow(
+                transactional_status: TransactionalStatus::<Test>::BuyNow(
                     cost,
                 ),
                 ..

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

@@ -55,7 +55,7 @@ fn start_nft_auction() {
         assert!(matches!(
             Content::video_by_id(video_id).nft_status,
             Some(OwnedNFT {
-                transactional_status: TransactionalStatus::Auction(created_auction,),
+                transactional_status: TransactionalStatus::<Test>::Auction(created_auction,),
                 ..
             }) if auction == created_auction
         ));