fix: remove validator correctly; add migration to remote validator at correct height

contracts/dao/neutron-staking-tracker/src/contract.rs

@@ -139,18 +139,15 @@ pub fn execute_update_config(
 pub fn sudo(deps: DepsMut, env: Env, msg: SudoMsg) -> Result<Response, ContractError> {
     match msg {
         SudoMsg::AfterValidatorCreated { val_addr } => after_validator_created(deps, env, val_addr),
-        SudoMsg::AfterValidatorRemoved {
-            cons_addr,
-            val_addr,
-        } => after_validator_removed(deps, env, cons_addr, val_addr),
-        SudoMsg::AfterValidatorBonded {
-            cons_addr,
-            val_addr,
-        } => after_validator_bonded(deps, env, cons_addr, val_addr),
-        SudoMsg::AfterValidatorBeginUnbonding {
-            cons_addr,
-            val_addr,
-        } => after_validator_begin_unbonding(deps, env, cons_addr, val_addr),
+        SudoMsg::AfterValidatorRemoved { val_addr, .. } => {
+            after_validator_removed(deps, env, val_addr)
+        }
+        SudoMsg::AfterValidatorBonded { val_addr, .. } => {
+            after_validator_bonded(deps, env, val_addr)
+        }
+        SudoMsg::AfterValidatorBeginUnbonding { val_addr, .. } => {
+            after_validator_begin_unbonding(deps, env, val_addr)
+        }
         SudoMsg::AfterDelegationModified { del_addr, val_addr } => {
             after_delegation_modified(deps, env, del_addr, val_addr)
         }
@@ -209,7 +206,6 @@ pub(crate) fn after_validator_removed(
     deps: DepsMut,
     env: Env,
     valoper_address: String,
-    _valcons_address: String,
 ) -> Result<Response, ContractError> {
     let validator_addr = Addr::unchecked(&valoper_address);
 
@@ -224,7 +220,6 @@ pub(crate) fn after_validator_removed(
 pub(crate) fn after_validator_bonded(
     deps: DepsMut,
     env: Env,
-    _valcons_address: String,
     valoper_address: String,
 ) -> Result<Response, ContractError> {
     let valoper_addr = Addr::unchecked(&valoper_address);
@@ -322,7 +317,6 @@ pub fn before_validator_slashed(
 pub(crate) fn after_validator_begin_unbonding(
     deps: DepsMut,
     env: Env,
-    _valcons_address: String,
     valoper_address: String,
 ) -> Result<Response, ContractError> {
     let mut resp = Response::new()
@@ -650,6 +644,12 @@ pub fn query_list_delegations(
 pub fn migrate(deps: DepsMut, _env: Env, _msg: MigrateMsg) -> Result<Response, ContractError> {
     // Set contract to version to latest
     set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
+
+    // Remove validator
+    let validator_addr = Addr::unchecked("neutronvaloper1v9xys5c4zdr89tvwq983ycnj3j4pekpjwr0raa");
+    let remove_height = 26438494;
+    VALIDATORS.remove(deps.storage, &validator_addr, remove_height)?;
+
     Ok(Response::default())
 }
 

contracts/dao/neutron-staking-tracker/src/testing/tests.rs

@@ -224,7 +224,6 @@ fn test_after_validator_removed() {
 
     // Define operator (valoper) and consensus (valcons) addresses
     let oper_addr = Addr::unchecked("neutronvaloper1xyz");
-    let cons_addr = Addr::unchecked("neutronvalconsoper1xyz");
 
     // Store some validator
     let validator = Validator {
@@ -243,12 +242,7 @@ fn test_after_validator_removed() {
         .unwrap();
 
     // Call `after_validator_removed`
-    let res = after_validator_removed(
-        deps.as_mut(),
-        env.clone(),
-        oper_addr.to_string(),
-        cons_addr.to_string(),
-    );
+    let res = after_validator_removed(deps.as_mut(), env.clone(), oper_addr.to_string());
     assert!(res.is_ok(), "Error: {:?}", res.err());
 
     let validator = VALIDATORS
@@ -275,7 +269,6 @@ fn test_after_validator_bonded_with_mock_query() {
 
     // Define operator (valoper) and consensus (valcons) addresses
     let oper_addr = Addr::unchecked("neutronvaloper1xyz");
-    let cons_addr = Addr::unchecked("neutronvalcons1xyz");
 
     BONDED_VALIDATORS_SET
         .save(deps.as_mut().storage, &Vec::new(), env.block.height)
@@ -313,12 +306,7 @@ fn test_after_validator_bonded_with_mock_query() {
     deps.querier.with_validators(vec![proto_validator]);
 
     // Call `after_validator_bonded`
-    let res = after_validator_bonded(
-        deps.as_mut(),
-        env.clone(),
-        cons_addr.to_string(),
-        oper_addr.to_string(),
-    );
+    let res = after_validator_bonded(deps.as_mut(), env.clone(), oper_addr.to_string());
     assert!(res.is_ok(), "Error: {:?}", res.err());
 
     // Load updated validator state
@@ -1208,7 +1196,6 @@ fn test_after_validator_begin_unbonding() {
     let admin = deps.api.addr_make("admin");
     // Define operator (valoper) and consensus (valcons) addresses
     let oper_addr = Addr::unchecked("neutronvaloper1xyz");
-    let cons_addr = Addr::unchecked("neutronvalcons1xyz");
 
     let config = Config {
         name: String::from("Test Config"),
@@ -1263,12 +1250,7 @@ fn test_after_validator_begin_unbonding() {
     deps.querier.with_validators(vec![proto_validator]);
 
     // Call `after_validator_begin_unbonding`
-    let res = after_validator_begin_unbonding(
-        deps.as_mut(),
-        env.clone(),
-        cons_addr.to_string(),
-        oper_addr.to_string(),
-    );
+    let res = after_validator_begin_unbonding(deps.as_mut(), env.clone(), oper_addr.to_string());
     assert!(res.is_ok(), "Error: {:?}", res.err());
     assert!(
         !BONDED_VALIDATORS_SET