chore: use Timestamps instead of Expiration for reserve

Author: Peartes

contracts/asset/src/execute.rs

@@ -1,4 +1,8 @@
-use cosmwasm_std::{BankMsg, Coin, CustomMsg, Deps, DepsMut, Env, MessageInfo, Response};
+use cosmwasm_std::{
+    BankMsg, Coin, CosmosMsg, CustomMsg, Deps, DepsMut, Env, MessageInfo, Response, StdError,
+    Timestamp,
+};
+use cw721::Expiration;
 use cw721::{state::NftInfo, traits::Cw721State};
 
 use crate::{
@@ -101,7 +105,7 @@ where
     check_can_list(deps.as_ref(), &env, info.sender.as_ref(), &nft_info)?;
 
     if let Some(reserved) = listing.reserved {
-        if !reserved.reserved_until.is_expired(&env.block) {
+        if !Expiration::AtTime(reserved.reserved_until).is_expired(&env.block) {
             return Err(ContractError::ReservedAsset { id: id.clone() });
         }
     }
@@ -137,7 +141,7 @@ where
     check_can_list(deps.as_ref(), &env, info.sender.as_ref(), &nft_info)?;
 
     if let Some(reserved) = &listing.reserved {
-        if !reserved.reserved_until.is_expired(&env.block) {
+        if !Expiration::AtTime(reserved.reserved_until).is_expired(&env.block) {
             return Err(ContractError::ReservedAsset { id: id.clone() });
         }
     }
@@ -348,12 +352,6 @@ where
     }
 }
 
-#[cfg(test)]
-use cosmwasm_std::{CosmosMsg, StdError};
-
-#[cfg(test)]
-use cw721::Expiration;
-
 #[cfg(test)]
 fn expect_ok<T, E: core::fmt::Debug>(res: Result<T, E>) -> T {
     match res {
@@ -901,7 +899,7 @@ fn test_buy() {
                 price: price.clone(),
                 reserved: Some(Reserve {
                     reserver: buyer_addr.clone(),
-                    reserved_until: Expiration::AtHeight(env.block.height + 100),
+                    reserved_until: env.block.time.plus_seconds(600),
                 }),
                 marketplace_fee_bps: None,
                 marketplace_fee_recipient: None,
@@ -953,7 +951,7 @@ fn test_buy() {
                 price: price.clone(),
                 reserved: Some(Reserve {
                     reserver: buyer_addr.clone(),
-                    reserved_until: Expiration::AtHeight(env.block.height + 100),
+                    reserved_until: env.block.time.plus_seconds(600),
                 }),
                 marketplace_fee_bps: None,
                 marketplace_fee_recipient: None,
@@ -1135,7 +1133,7 @@ fn test_delist() {
                 seller: seller_addr.clone(),
                 price: price.clone(),
                 reserved: Some(Reserve {
-                    reserved_until: Expiration::AtHeight(env.block.height + 100),
+                    reserved_until: env.block.time.plus_seconds(600),
                     reserver: seller_addr.clone(),
                 }),
                 marketplace_fee_bps: None,
@@ -1184,7 +1182,7 @@ fn test_reserve() {
         // cannot reserve unlisted item
         let reservation = Reserve {
             reserver: buyer_addr.clone(),
-            reserved_until: Expiration::AtHeight(env.block.height + 100),
+            reserved_until: env.block.time.plus_seconds(600),
         };
         let err = expect_err(reserve::<Empty, Empty>(
             deps.as_mut(),
@@ -1293,7 +1291,7 @@ fn test_unreserve() {
 
         let reservation = Reserve {
             reserver: reserver_addr.clone(),
-            reserved_until: Expiration::AtHeight(env.block.height + 10),
+            reserved_until: env.block.time.plus_seconds(600),
         };
 
         expect_ok(AssetConfig::<Empty>::default().listings.save(
@@ -1368,7 +1366,7 @@ fn test_unreserve() {
                 price: Coin::new(150 as u128, "uxion"),
                 reserved: Some(Reserve {
                     reserver: reserver_addr.clone(),
-                    reserved_until: Expiration::AtHeight(env.block.height + 10),
+                    reserved_until: env.block.time.plus_seconds(600),
                 }),
                 marketplace_fee_bps: None,
                 marketplace_fee_recipient: None,
@@ -1435,7 +1433,7 @@ fn test_unreserve() {
                 price: Coin::new(200 as u128, "uxion"),
                 reserved: Some(Reserve {
                     reserver: reserver_addr.clone(),
-                    reserved_until: Expiration::AtHeight(env.block.height + 10),
+                    reserved_until: env.block.time.plus_seconds(600),
                 }),
                 marketplace_fee_bps: None,
                 marketplace_fee_recipient: None,

contracts/asset/src/plugin.rs

@@ -794,9 +794,9 @@ pub mod default_plugins {
     ) -> StdResult<bool> {
         if let Some(time_lock) = &ctx.data.time_lock {
             if let Some(reservation) = &ctx.data.reservation {
-                if reservation.reserved_until
-                    > Expiration::AtTime(ctx.env.block.time.plus_seconds(time_lock.as_secs()))
-                {
+                if Expiration::AtTime(reservation.reserved_until).gt(&Expiration::AtTime(
+                    ctx.env.block.time.plus_seconds(time_lock.as_secs()),
+                )) {
                     return Err(cosmwasm_std::StdError::generic_err(format!(
                         "Reservation end time {} exceeds the collection time lock {}",
                         reservation.reserved_until,

contracts/asset/src/state.rs

@@ -1,5 +1,5 @@
 use cosmwasm_schema::cw_serde;
-use cosmwasm_std::{Addr, Coin};
+use cosmwasm_std::{Addr, Coin, Timestamp};
 use cw_storage_plus::{IndexList, IndexedMap, Item, Map, MultiIndex};
 use cw721::{Expiration, state::Cw721Config, traits::Cw721State};
 
@@ -18,7 +18,7 @@ pub struct ListingInfo {
 #[cw_serde]
 pub struct Reserve {
     pub reserver: Addr,
-    pub reserved_until: Expiration,
+    pub reserved_until: Timestamp,
 }
 
 pub struct AssetConfig<'a, TNftExtension>

contracts/asset/src/test.rs

@@ -129,11 +129,11 @@ mod plugins_test {
         let deps = mock_dependencies();
         let env = env_at(1_000);
         let info = message_info(&deps.api.addr_make("marketplace"), &[]);
-        let mut ctx = build_ctx(deps.as_ref(), env, info);
+        let mut ctx = build_ctx(deps.as_ref(), env.clone(), info);
         ctx.data.time_lock = Some(Duration::from_secs(2_000));
         ctx.data.reservation = Some(Reserve {
             reserver: Addr::unchecked("reserver"),
-            reserved_until: Expiration::AtTime(Timestamp::from_seconds(1_500)),
+            reserved_until: env.block.time.plus_seconds(600),
         });
 
         assert!(default_plugins::time_lock_plugin(&mut ctx).is_ok());
@@ -144,11 +144,13 @@ mod plugins_test {
         let deps = mock_dependencies();
         let env = env_at(1_000);
         let info = message_info(&deps.api.addr_make("marketplace"), &[]);
-        let mut ctx = build_ctx(deps.as_ref(), env, info);
-        ctx.data.time_lock = Some(Duration::from_secs(2_000));
+        let mut ctx = build_ctx(deps.as_ref(), env.clone(), info);
+        ctx.data.time_lock = Some(Duration::from_secs(
+            env.block.time.plus_seconds(2_000).seconds(),
+        ));
         ctx.data.reservation = Some(Reserve {
             reserver: Addr::unchecked("reserver"),
-            reserved_until: Expiration::AtTime(Timestamp::from_seconds(3_500)),
+            reserved_until: env.block.time.plus_seconds(6000),
         });
 
         assert!(default_plugins::time_lock_plugin(&mut ctx).is_err());
@@ -728,10 +730,10 @@ mod asset_pluggable_tests {
 
         let env = env_at(1_000);
         let info = message_info(&reserver, &[]);
-        let mut ctx = build_ctx(deps.as_ref(), env, info);
+        let mut ctx = build_ctx(deps.as_ref(), env.clone(), info);
         let reservation = Reserve {
             reserver: reserver.clone(),
-            reserved_until: Expiration::AtTime(Timestamp::from_seconds(1_500)),
+            reserved_until: env.block.time.plus_seconds(1_500),
         };
 
         let result = contract
@@ -765,10 +767,10 @@ mod asset_pluggable_tests {
 
         let env = env_at(1_000);
         let info = message_info(&reserver, &[]);
-        let mut ctx = build_ctx(deps.as_ref(), env, info);
+        let mut ctx = build_ctx(deps.as_ref(), env.clone(), info);
         let reservation = Reserve {
             reserver: reserver.clone(),
-            reserved_until: Expiration::AtTime(Timestamp::from_seconds(1_200)),
+            reserved_until: env.block.time.plus_seconds(1_200),
         };
 
         let result = contract.on_reserve_plugin(&"token-1".to_string(), &reservation, &mut ctx);
@@ -814,10 +816,10 @@ mod asset_pluggable_tests {
 
         let env = env_at(1_000);
         let info = message_info(&reserver, &[]);
-        let mut ctx = build_ctx(deps.as_ref(), env, info);
+        let mut ctx = build_ctx(deps.as_ref(), env.clone(), info);
         let reservation = Reserve {
             reserver: reserver.clone(),
-            reserved_until: Expiration::AtTime(Timestamp::from_seconds(3_000)),
+            reserved_until: env.block.time.plus_seconds(3_000),
         };
 
         let result = contract.on_reserve_plugin(&"token-1".to_string(), &reservation, &mut ctx);