Solved small bugs in auctions contract

Author: arthurvinci

nft/nft-marketplace/src/dutch_auction.rs

@@ -118,7 +118,7 @@ mod dutch_auction {
                 "[Instantiation]: The starting price must be greater than the ending price."
             );
             assert!(
-                Runtime::current_epoch().after(relative_ending_epoch) > Runtime::current_epoch(),
+                Runtime::current_epoch().after(relative_ending_epoch).unwrap() > Runtime::current_epoch(),
                 "[Instantiation]: The ending epoch has already passed."
             );
 
@@ -165,13 +165,13 @@ mod dutch_auction {
                 starting_price,
                 ending_price,
                 starting_epoch: Runtime::current_epoch(),
-                ending_epoch: Runtime::current_epoch().after(relative_ending_epoch),
+                ending_epoch: Runtime::current_epoch().after(relative_ending_epoch).unwrap(),
             }
-            .instantiate()
-            .prepare_to_globalize(OwnerRole::Updatable(rule!(require(
+                .instantiate()
+                .prepare_to_globalize(OwnerRole::Updatable(rule!(require(
                 ownership_badge.resource_address()
             ))))
-            .globalize();
+                .globalize();
 
             return (dutch_auction, ownership_badge);
         }

nft/nft-marketplace/src/english_auction.rs

@@ -112,7 +112,7 @@ mod english_auction {
                 "[Instantiation]: Only payments of fungible resources are accepted."
             );
             assert!(
-                Runtime::current_epoch().after(relative_ending_epoch) > Runtime::current_epoch(),
+                Runtime::current_epoch().after(relative_ending_epoch).unwrap() > Runtime::current_epoch(),
                 "[Instantiation]: The ending epoch has already passed."
             );
 
@@ -137,7 +137,7 @@ mod english_auction {
                 .metadata(metadata!(
                     init {
                         "name" => "Ownership Badge".to_owned(), locked;
-                        "description" => 
+                        "description" =>
                         "An ownership badge used to authenticate the owner of the NFT(s).".to_owned(), locked;
                         "symbol" => "OWNER".to_owned(), locked;
                     }
@@ -154,7 +154,7 @@ mod english_auction {
                     .metadata(metadata!(
                         init {
                             "name" => "Bidder Badge".to_owned(), locked;
-                            "description" => 
+                            "description" =>
                             "A badge provided to bidders to keep track of the amount they've bid".to_owned(), locked;
                             "symbol" => "BIDDER".to_owned(), locked;
                         }
@@ -186,15 +186,15 @@ mod english_auction {
                 payment_vault: Vault::new(accepted_payment_token),
                 bidders_badge: bidder_badge_resource_address,
                 accepted_payment_token,
-                ending_epoch: Runtime::current_epoch().after(relative_ending_epoch),
+                ending_epoch: Runtime::current_epoch().after(relative_ending_epoch).unwrap(),
                 state: AuctionState::Open,
             }
-            .instantiate()
-            .prepare_to_globalize(OwnerRole::Updatable(rule!(require(
+                .instantiate()
+                .prepare_to_globalize(OwnerRole::Updatable(rule!(require(
                 ownership_badge.resource_address()
             ))))
-            .with_address(address_reservation)
-            .globalize();
+                .with_address(address_reservation)
+                .globalize();
 
             return (english_auction, ownership_badge);
         }

nft/nft-marketplace/transaction_manifest/dutch_auction/instantiate_dutch_auction.rtm

@@ -1,17 +1,17 @@
 CALL_METHOD
-    Address("account_sim1cyfhfs4a94n7kp7k47s55yx685lgwvp2kc6k6tm9kev8qpnlgjea7f")
+    Address("account_sim1c8m6h4yv2x9ca0wx5ddtl0nctqmjt2t740wfjgj9w8sdz82zf8ppcr")
     "withdraw_non_fungibles"
-    Address("resource_sim1ngs0rnmld9e9jhrd2ujcnp0np4n30ph0u9307ulnr28tvrjy4uwvfl")
+    Address("resource_sim1nf6kz5luvdz6rugagxx7ksst22xud8nj3mmldh2d92tvxsgd003lqe")
     Array<NonFungibleLocalId>(
         NonFungibleLocalId("#1#")
     )
 ;
 TAKE_ALL_FROM_WORKTOP
-    Address("resource_sim1ngs0rnmld9e9jhrd2ujcnp0np4n30ph0u9307ulnr28tvrjy4uwvfl")
+    Address("resource_sim1nf6kz5luvdz6rugagxx7ksst22xud8nj3mmldh2d92tvxsgd003lqe")
     Bucket("bucket")
 ;
 CALL_FUNCTION
-    Address("package_sim1pkv87klswwg29hqznsfjtlfc69r2glfjj3dpj0ascm0pjw5e0g75h5")
+    Address("package_sim1phhyaadjcggz9vs26vp5rl52pvsa0mppqkfkt9ld7rqdndxpzcl9j8")
     "DutchAuction"
     "instantiate_dutch_auction"
     Array<Bucket>(
@@ -23,7 +23,7 @@ CALL_FUNCTION
     10u64
 ;
 CALL_METHOD
-    Address("account_sim1cyfhfs4a94n7kp7k47s55yx685lgwvp2kc6k6tm9kev8qpnlgjea7f")
+    Address("account_sim1c8m6h4yv2x9ca0wx5ddtl0nctqmjt2t740wfjgj9w8sdz82zf8ppcr")
     "deposit_batch"
     Expression("ENTIRE_WORKTOP")
 ;

nft/nft-marketplace/transaction_manifest/fixed_price_sale/instantiate_fixed_price_sale.rtm

@@ -1,17 +1,17 @@
 CALL_METHOD
-    Address("account_sim1cyfhfs4a94n7kp7k47s55yx685lgwvp2kc6k6tm9kev8qpnlgjea7f")
+    Address("account_sim1c8m6h4yv2x9ca0wx5ddtl0nctqmjt2t740wfjgj9w8sdz82zf8ppcr")
     "withdraw_non_fungibles"
-    Address("resource_sim1ngs0rnmld9e9jhrd2ujcnp0np4n30ph0u9307ulnr28tvrjy4uwvfl")
+    Address("resource_sim1nf6kz5luvdz6rugagxx7ksst22xud8nj3mmldh2d92tvxsgd003lqe")
     Array<NonFungibleLocalId>(
         NonFungibleLocalId("#1#")
     )
 ;
 TAKE_ALL_FROM_WORKTOP
-    Address("resource_sim1ngs0rnmld9e9jhrd2ujcnp0np4n30ph0u9307ulnr28tvrjy4uwvfl")
+    Address("resource_sim1nf6kz5luvdz6rugagxx7ksst22xud8nj3mmldh2d92tvxsgd003lqe")
     Bucket("bucket")
 ;
 CALL_FUNCTION
-    Address("package_sim1pkv87klswwg29hqznsfjtlfc69r2glfjj3dpj0ascm0pjw5e0g75h5")
+    Address("package_sim1phhyaadjcggz9vs26vp5rl52pvsa0mppqkfkt9ld7rqdndxpzcl9j8")
     "FixedPriceSale"
     "instantiate_fixed_price_sale"
     Array<Bucket>(
@@ -21,7 +21,7 @@ CALL_FUNCTION
     Decimal("10")
 ;
 CALL_METHOD
-    Address("account_sim1cyfhfs4a94n7kp7k47s55yx685lgwvp2kc6k6tm9kev8qpnlgjea7f")
+    Address("account_sim1c8m6h4yv2x9ca0wx5ddtl0nctqmjt2t740wfjgj9w8sdz82zf8ppcr")
     "deposit_batch"
     Expression("ENTIRE_WORKTOP")
 ;