Update the error for discount price removal too soon

public-awesome · Apr 3, 2024 · 184d034 · 184d034
1 parent d8e7897
commit 184d034
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 9 deletions.
diff --git a/contracts/minters/vending-minter-featured/src/contract.rs b/contracts/minters/vending-minter-featured/src/contract.rs
@@ -310,8 +310,8 @@ pub fn execute_remove_discount_price(
     }
 
     let last_discount_time = LAST_DISCOUNT_TIME.load(deps.storage)?;
-    if last_discount_time.plus_seconds(12 * 60 * 60) > env.block.time {
-        return Err(ContractError::DiscountUpdateTooSoon {});
+    if last_discount_time.plus_seconds(60 * 60) > env.block.time {
+        return Err(ContractError::DiscountRemovalTooSoon {});
     }
 
     config.extension.discount_price = None;

diff --git a/contracts/minters/vending-minter-featured/src/error.rs b/contracts/minters/vending-minter-featured/src/error.rs
@@ -59,6 +59,9 @@ pub enum ContractError {
     #[error("Discount price can only be updated every 12 hours")]
     DiscountUpdateTooSoon {},
 
+    #[error("Discount price can only be removed 1 hour after the last update")]
+    DiscountRemovalTooSoon {},
+
     #[error("Invalid address {addr}")]
     InvalidAddress { addr: String },
 

diff --git a/contracts/minters/vending-minter-merkle-wl/src/contract.rs b/contracts/minters/vending-minter-merkle-wl/src/contract.rs
@@ -310,8 +310,8 @@ pub fn execute_remove_discount_price(
         ));
     }
     let last_discount_time = LAST_DISCOUNT_TIME.load(deps.storage)?;
-    if last_discount_time.plus_seconds(12 * 60 * 60) > env.block.time {
-        return Err(ContractError::DiscountUpdateTooSoon {});
+    if last_discount_time.plus_seconds(60 * 60) > env.block.time {
+        return Err(ContractError::DiscountRemovalTooSoon {});
     }
     config.extension.discount_price = None;
     CONFIG.save(deps.storage, &config)?;

diff --git a/contracts/minters/vending-minter-merkle-wl/src/error.rs b/contracts/minters/vending-minter-merkle-wl/src/error.rs
@@ -59,6 +59,9 @@ pub enum ContractError {
     #[error("Discount price can only be updated every 12 hours")]
     DiscountUpdateTooSoon {},
 
+    #[error("Discount price can only be removed 1 hour after the last update")]
+    DiscountRemovalTooSoon {},
+
     #[error("Invalid address {addr}")]
     InvalidAddress { addr: String },
 

diff --git a/contracts/minters/vending-minter-wl-flex-featured/src/contract.rs b/contracts/minters/vending-minter-wl-flex-featured/src/contract.rs
@@ -296,7 +296,7 @@ pub fn execute_remove_discount_price(
     }
     let last_discount_time = LAST_DISCOUNT_TIME.load(deps.storage)?;
     if last_discount_time.plus_seconds(60 * 60) > env.block.time {
-        return Err(ContractError::DiscountUpdateTooSoon {});
+        return Err(ContractError::DiscountRemovalTooSoon {});
     }
     config.extension.discount_price = None;
     CONFIG.save(deps.storage, &config)?;

diff --git a/contracts/minters/vending-minter-wl-flex-featured/src/error.rs b/contracts/minters/vending-minter-wl-flex-featured/src/error.rs
@@ -59,6 +59,9 @@ pub enum ContractError {
     #[error("Discount price can only be updated every 12 hours")]
     DiscountUpdateTooSoon {},
 
+    #[error("Discount price can only be removed 1 hour after the last update")]
+    DiscountRemovalTooSoon {},
+
     #[error("Invalid address {addr}")]
     InvalidAddress { addr: String },
 

diff --git a/contracts/minters/vending-minter-wl-flex/src/contract.rs b/contracts/minters/vending-minter-wl-flex/src/contract.rs
@@ -294,8 +294,8 @@ pub fn execute_remove_discount_price(
         ));
     }
     let last_discount_time = LAST_DISCOUNT_TIME.load(deps.storage)?;
-    if last_discount_time.plus_seconds(12 * 60 * 60) > env.block.time {
-        return Err(ContractError::DiscountUpdateTooSoon {});
+    if last_discount_time.plus_seconds(60 * 60) > env.block.time {
+        return Err(ContractError::DiscountRemovalTooSoon {});
     }
     config.extension.discount_price = None;
     CONFIG.save(deps.storage, &config)?;

diff --git a/contracts/minters/vending-minter-wl-flex/src/error.rs b/contracts/minters/vending-minter-wl-flex/src/error.rs
@@ -59,6 +59,9 @@ pub enum ContractError {
     #[error("Discount price can only be updated every 12 hours")]
     DiscountUpdateTooSoon {},
 
+    #[error("Discount price can only be removed 1 hour after the last update")]
+    DiscountRemovalTooSoon {},
+
     #[error("Invalid address {addr}")]
     InvalidAddress { addr: String },
 

diff --git a/contracts/minters/vending-minter/src/contract.rs b/contracts/minters/vending-minter/src/contract.rs
@@ -309,8 +309,8 @@ pub fn execute_remove_discount_price(
         ));
     }
     let last_discount_time = LAST_DISCOUNT_TIME.load(deps.storage)?;
-    if last_discount_time.plus_seconds(12 * 60 * 60) > env.block.time {
-        return Err(ContractError::DiscountUpdateTooSoon {});
+    if last_discount_time.plus_seconds(60 * 60) > env.block.time {
+        return Err(ContractError::DiscountRemovalTooSoon {});
     }
     config.extension.discount_price = None;
     CONFIG.save(deps.storage, &config)?;

diff --git a/contracts/minters/vending-minter/src/error.rs b/contracts/minters/vending-minter/src/error.rs
@@ -59,6 +59,9 @@ pub enum ContractError {
     #[error("Discount price can only be updated every 12 hours")]
     DiscountUpdateTooSoon {},
 
+    #[error("Discount price can only be removed 1 hour after the last update")]
+    DiscountRemovalTooSoon {},
+
     #[error("Invalid address {addr}")]
     InvalidAddress { addr: String },