Fix cosmwasm/optimizer build errors

Author: justinbarry

contracts/asset/src/default_plugins.rs

@@ -105,17 +105,18 @@ pub fn not_after_plugin(ctx: &mut PluginCtx<DefaultXionAssetContext, Empty>) ->
 // can be made that exceeds 1 week from now
 // this is to prevent an indefinite reservation that exceeds the time lock
 pub fn time_lock_plugin(ctx: &mut PluginCtx<DefaultXionAssetContext, Empty>) -> StdResult<bool> {
-    if let Some(time_lock) = &ctx.data.time_lock
-        && let Some(reservation) = &ctx.data.reservation
-        && 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,
-            Expiration::AtTime(ctx.env.block.time.plus_seconds(time_lock.as_secs()))
-        )));
+    if let Some(time_lock) = &ctx.data.time_lock {
+        if let Some(reservation) = &ctx.data.reservation {
+            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,
+                    Expiration::AtTime(ctx.env.block.time.plus_seconds(time_lock.as_secs()))
+                )));
+            }
+        }
     }
     Ok(true)
 }
@@ -221,20 +222,20 @@ pub fn allowed_currencies_plugin(
 
     let allowed_set: HashSet<&str> = allowed.iter().map(|d| d.denom.as_str()).collect();
 
-    if let Some(price) = &ctx.data.ask_price
-        && !allowed_set.contains(price.denom.as_str())
-    {
-        return Err(cosmwasm_std::StdError::generic_err(
-            "ask price currency is not allowed",
-        ));
+    if let Some(price) = &ctx.data.ask_price {
+        if !allowed_set.contains(price.denom.as_str()) {
+            return Err(cosmwasm_std::StdError::generic_err(
+                "ask price currency is not allowed",
+            ));
+        }
     }
 
-    if let Some(min_price) = &ctx.data.min_price
-        && !allowed_set.contains(min_price.denom.as_str())
-    {
-        return Err(cosmwasm_std::StdError::generic_err(
-            "minimum price currency is not allowed",
-        ));
+    if let Some(min_price) = &ctx.data.min_price {
+        if !allowed_set.contains(min_price.denom.as_str()) {
+            return Err(cosmwasm_std::StdError::generic_err(
+                "minimum price currency is not allowed",
+            ));
+        }
     }
 
     for coin in &ctx.info.funds {

contracts/asset/src/execute/reservation.rs

@@ -40,10 +40,10 @@ where
         });
     }
 
-    if let Some(reserved) = &listing.reserved
-        && !Expiration::AtTime(reserved.reserved_until).is_expired(&env.block)
-    {
-        return Err(ContractError::ReservedAsset { id: id.clone() });
+    if let Some(reserved) = &listing.reserved {
+        if !Expiration::AtTime(reserved.reserved_until).is_expired(&env.block) {
+            return Err(ContractError::ReservedAsset { id: id.clone() });
+        }
     }
 
     let reserver = if let Some(reserver) = reservation.reserver {