refactor: uses procedural macro frto replace the MigrateInvalidVersio…

…n on V2 contracts
White-Whale-Defi-Platform · Jul 3, 2024 · 6956598 · 6956598
1 parent 0fa6df4
commit 6956598
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 52 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -59,6 +59,7 @@ prost = { version = "0.11.9", default-features = false, features = [
   "prost-derive",
 ] }
 test-case = { version = "3.3.1" }
+cw-migrate-error-derive = { version = "0.1.0" }
 
 # contracts
 whale-lair = { path = "./contracts/liquidity_hub/whale_lair" }

diff --git a/contracts/liquidity_hub/bonding-manager/Cargo.toml b/contracts/liquidity_hub/bonding-manager/Cargo.toml
@@ -41,6 +41,7 @@ white-whale-std.workspace = true
 cw-utils.workspace = true
 pool-manager.workspace = true
 cw-ownable.workspace = true
+cw-migrate-error-derive.workspace = true
 
 [dev-dependencies]
 cw-multi-test.workspace = true

diff --git a/contracts/liquidity_hub/bonding-manager/src/error.rs b/contracts/liquidity_hub/bonding-manager/src/error.rs
@@ -1,11 +1,12 @@
 use cosmwasm_std::{
     CheckedMultiplyFractionError, DivideByZeroError, OverflowError, StdError, Uint128,
 };
+use cw_migrate_error_derive::cw_migrate_invalid_version_error;
 use cw_ownable::OwnershipError;
 use cw_utils::PaymentError;
-use semver::Version;
 use thiserror::Error;
 
+#[cw_migrate_invalid_version_error]
 #[derive(Error, Debug, PartialEq)]
 pub enum ContractError {
     #[error("{0}")]
@@ -55,12 +56,6 @@ pub enum ContractError {
     #[error("Nothing to withdraw")]
     NothingToWithdraw,
 
-    #[error("Attempt to migrate to version {new_version}, but contract is on a higher version {current_version}")]
-    MigrateInvalidVersion {
-        new_version: Version,
-        current_version: Version,
-    },
-
     #[error("There are unclaimed rewards available. Claim them before attempting to bond/unbond")]
     UnclaimedRewards,
 

diff --git a/contracts/liquidity_hub/epoch-manager/Cargo.toml b/contracts/liquidity_hub/epoch-manager/Cargo.toml
@@ -35,3 +35,4 @@ thiserror.workspace = true
 white-whale-std.workspace = true
 cw-controllers.workspace = true
 cw-utils.workspace = true
+cw-migrate-error-derive.workspace = true
diff --git a/contracts/liquidity_hub/epoch-manager/src/error.rs b/contracts/liquidity_hub/epoch-manager/src/error.rs
@@ -1,9 +1,10 @@
 use cosmwasm_std::StdError;
 use cw_controllers::{AdminError, HookError};
+use cw_migrate_error_derive::cw_migrate_invalid_version_error;
 use cw_utils::PaymentError;
-use semver::Version;
 use thiserror::Error;
 
+#[cw_migrate_invalid_version_error]
 #[derive(Error, Debug)]
 pub enum ContractError {
     #[error("{0}")]
@@ -24,12 +25,6 @@ pub enum ContractError {
     #[error("Semver parsing error: {0}")]
     SemVer(String),
 
-    #[error("Attempt to migrate to version {new_version}, but contract is on a higher version {current_version}")]
-    MigrateInvalidVersion {
-        new_version: Version,
-        current_version: Version,
-    },
-
     #[error("The current epoch epoch has not expired yet.")]
     CurrentEpochNotExpired,
 

diff --git a/contracts/liquidity_hub/incentive-manager/Cargo.toml b/contracts/liquidity_hub/incentive-manager/Cargo.toml
@@ -36,6 +36,7 @@ thiserror.workspace = true
 white-whale-std.workspace = true
 cw-utils.workspace = true
 cw-ownable.workspace = true
+cw-migrate-error-derive.workspace = true
 
 [dev-dependencies]
 cw-multi-test.workspace = true

diff --git a/contracts/liquidity_hub/incentive-manager/src/error.rs b/contracts/liquidity_hub/incentive-manager/src/error.rs
@@ -2,13 +2,14 @@ use cosmwasm_std::{
     CheckedFromRatioError, CheckedMultiplyFractionError, ConversionOverflowError,
     DivideByZeroError, OverflowError, StdError, Uint128,
 };
+use cw_migrate_error_derive::cw_migrate_invalid_version_error;
 use cw_ownable::OwnershipError;
 use cw_utils::PaymentError;
-use semver::Version;
 use thiserror::Error;
 
 use white_whale_std::incentive_manager::EpochId;
 
+#[cw_migrate_invalid_version_error]
 #[derive(Error, Debug)]
 pub enum ContractError {
     #[error("{0}")]
@@ -148,12 +149,6 @@ pub enum ContractError {
 
     #[error("There's no snapshot of the LP weight in the contract for the epoch {epoch_id}")]
     LpWeightNotFound { epoch_id: EpochId },
-
-    #[error("Attempt to migrate to version {new_version}, but contract is on a higher version {current_version}")]
-    MigrateInvalidVersion {
-        new_version: Version,
-        current_version: Version,
-    },
 }
 
 impl From<semver::Error> for ContractError {

diff --git a/contracts/liquidity_hub/pool-manager/Cargo.toml b/contracts/liquidity_hub/pool-manager/Cargo.toml
@@ -48,6 +48,7 @@ cw-utils.workspace = true
 cw-ownable.workspace = true
 sha2.workspace = true
 semver.workspace = true
+cw-migrate-error-derive.workspace = true
 
 [dev-dependencies]
 cw-multi-test.workspace = true

diff --git a/contracts/liquidity_hub/pool-manager/src/error.rs b/contracts/liquidity_hub/pool-manager/src/error.rs
@@ -4,12 +4,13 @@ use cosmwasm_std::{
     ConversionOverflowError, DivideByZeroError, Instantiate2AddressError, OverflowError, StdError,
     Uint128,
 };
+use cw_migrate_error_derive::cw_migrate_invalid_version_error;
 use cw_ownable::OwnershipError;
 use cw_utils::PaymentError;
-use semver::Version;
 use thiserror::Error;
 use white_whale_std::pool_manager::SwapRoute;
 
+#[cw_migrate_invalid_version_error]
 #[derive(Error, Debug, PartialEq)]
 pub enum ContractError {
     // Handle all normal errors from the StdError
@@ -38,12 +39,6 @@ pub enum ContractError {
     #[error("The provided assets are both the same")]
     SameAsset,
 
-    #[error("Attempt to migrate to version {new_version}, but contract is on a higher version {current_version}")]
-    MigrateInvalidVersion {
-        new_version: Version,
-        current_version: Version,
-    },
-
     #[error(
         "Assertion failed; minimum receive amount: {minimum_receive}, swap amount: {swap_amount}"
     )]

diff --git a/contracts/liquidity_hub/vault-manager/Cargo.toml b/contracts/liquidity_hub/vault-manager/Cargo.toml
@@ -43,6 +43,7 @@ thiserror.workspace = true
 white-whale-std.workspace = true
 cw-utils.workspace = true
 cw-ownable.workspace = true
+cw-migrate-error-derive.workspace = true
 
 [dev-dependencies]
 cw-multi-test.workspace = true

diff --git a/contracts/liquidity_hub/vault-manager/src/error.rs b/contracts/liquidity_hub/vault-manager/src/error.rs
@@ -1,9 +1,10 @@
 use cosmwasm_std::{ConversionOverflowError, DivideByZeroError, OverflowError, StdError, Uint128};
+use cw_migrate_error_derive::cw_migrate_invalid_version_error;
 use cw_ownable::OwnershipError;
 use cw_utils::PaymentError;
-use semver::Version;
 use thiserror::Error;
 
+#[cw_migrate_invalid_version_error]
 #[derive(Error, Debug, PartialEq)]
 pub enum ContractError {
     #[error("{0}")]
@@ -26,12 +27,6 @@ pub enum ContractError {
         identifier: String,
     },
 
-    #[error("Attempt to migrate to version {new_version}, but contract is on a higher version {current_version}")]
-    MigrateInvalidVersion {
-        new_version: Version,
-        current_version: Version,
-    },
-
     #[error("Vault doesn't exist")]
     NonExistentVault {},