Merge pull request #186 from confio/182-migrate-contract

tgrade-valset: migrate contract update
confio · Sep 19, 2022 · eab1c2b · eab1c2b
2 parents 64388eb + 6c091ec
commit eab1c2b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 148 deletions.
diff --git a/contracts/tgrade-valset/src/contract.rs b/contracts/tgrade-valset/src/contract.rs
@@ -23,7 +23,6 @@ use tg_bindings::{
 use tg_utils::{Duration, JailingDuration, SlashMsg, ADMIN};
 
 use crate::error::ContractError;
-use crate::migration::{migrate_jailing_period, migrate_verify_validators};
 use crate::msg::{
     EpochResponse, ExecuteMsg, InstantiateMsg, InstantiateResponse, JailingEnd, JailingPeriod,
     ListActiveValidatorsResponse, ListValidatorResponse, ListValidatorSlashingResponse, MigrateMsg,
@@ -983,12 +982,11 @@ fn calculate_diff(
 
 #[cfg_attr(not(feature = "library"), entry_point)]
 pub fn migrate(
-    mut deps: DepsMut<TgradeQuery>,
+    deps: DepsMut<TgradeQuery>,
     _env: Env,
     msg: MigrateMsg,
 ) -> Result<Response, ContractError> {
-    let original_version =
-        ensure_from_older_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+    ensure_from_older_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
 
     CONFIG.update::<_, StdError>(deps.storage, |mut cfg| {
         if let Some(min_points) = msg.min_points {
@@ -997,16 +995,15 @@ pub fn migrate(
         if let Some(max_validators) = msg.max_validators {
             cfg.max_validators = max_validators;
         }
+        if let Some(distribution_contracts) = msg.distribution_contracts {
+            cfg.distribution_contracts = distribution_contracts;
+        }
         if let Some(verify_validators) = msg.verify_validators {
             cfg.verify_validators = verify_validators;
         }
         Ok(cfg)
     })?;
 
-    migrate_jailing_period(deps.branch(), &original_version)?;
-
-    migrate_verify_validators(deps.branch(), &original_version)?;
-
     Ok(Response::new())
 }
 

diff --git a/contracts/tgrade-valset/src/lib.rs b/contracts/tgrade-valset/src/lib.rs
@@ -1,6 +1,5 @@
 pub mod contract;
 pub mod error;
-mod migration;
 pub mod msg;
 #[cfg(test)]
 mod multitest;

diff --git a/contracts/tgrade-valset/src/migration.rs b/contracts/tgrade-valset/src/migration.rs
diff --git a/contracts/tgrade-valset/src/msg.rs b/contracts/tgrade-valset/src/msg.rs
@@ -547,6 +547,7 @@ pub struct InstantiateResponse {
 pub struct MigrateMsg {
     pub min_points: Option<u64>,
     pub max_validators: Option<u32>,
+    pub distribution_contracts: Option<Vec<DistributionContract>>,
     pub verify_validators: Option<bool>,
 }
 

diff --git a/contracts/tgrade-valset/src/multitest/migration.rs b/contracts/tgrade-valset/src/multitest/migration.rs
@@ -1,5 +1,7 @@
 use super::suite::SuiteBuilder;
 use crate::msg::MigrateMsg;
+use crate::state::DistributionContract;
+use cosmwasm_std::{Addr, Decimal};
 
 #[test]
 fn migration_can_alter_cfg() {
@@ -19,6 +21,10 @@ fn migration_can_alter_cfg() {
             &MigrateMsg {
                 min_points: Some(5),
                 max_validators: Some(10),
+                distribution_contracts: Some(vec![DistributionContract {
+                    contract: Addr::unchecked("engagement1".to_string()),
+                    ratio: Decimal::percent(50),
+                }]),
                 verify_validators: Some(true),
             },
         )
@@ -27,4 +33,12 @@ fn migration_can_alter_cfg() {
     let cfg = suite.config().unwrap();
     assert_eq!(cfg.max_validators, 10);
     assert_eq!(cfg.min_points, 5);
+    assert!(cfg.verify_validators);
+    assert_eq!(
+        cfg.distribution_contracts,
+        vec![DistributionContract {
+            contract: Addr::unchecked("engagement1".to_string()),
+            ratio: Decimal::percent(50),
+        }]
+    );
 }