Merge pull request #250 from terra-money/fix/delete-validator-0.2.x

javiersuweijie · web-flow · commit 0be00a9506d3 · 2023-09-08T09:50:12.000+08:00
fix: delete validator 0.3.x
diff --git a/x/alliance/keeper/hooks.go b/x/alliance/keeper/hooks.go
@@ -19,7 +19,8 @@ func (h Hooks) BeforeValidatorModified(_ sdk.Context, _ sdk.ValAddress) error {
 	return nil
 }
 
-func (h Hooks) AfterValidatorRemoved(ctx sdk.Context, _ sdk.ConsAddress, _ sdk.ValAddress) error {
+func (h Hooks) AfterValidatorRemoved(ctx sdk.Context, _ sdk.ConsAddress, valAddr sdk.ValAddress) error {
+	h.k.DeleteValidatorInfo(ctx, valAddr)
 	h.k.QueueAssetRebalanceEvent(ctx)
 	return nil
 }
diff --git a/x/alliance/keeper/validator.go b/x/alliance/keeper/validator.go
@@ -72,3 +72,9 @@ func (k Keeper) GetAllAllianceValidatorInfo(ctx sdk.Context) []types.AllianceVal
 	}
 	return infos
 }
+
+func (k Keeper) DeleteValidatorInfo(ctx sdk.Context, valAddr sdk.ValAddress) {
+	store := ctx.KVStore(k.storeKey)
+	key := types.GetAllianceValidatorInfoKey(valAddr)
+	store.Delete(key)
+}
diff --git a/x/alliance/tests/benchmark/benchmark_genesis.json b/x/alliance/tests/benchmark/benchmark_genesis.json

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ func (h Hooks) BeforeValidatorModified(_ sdk.Context, _ sdk.ValAddress) error {`
`19`	`19`	`return nil`
`20`	`20`	`}`
`21`	`21`
`22`		`-func (h Hooks) AfterValidatorRemoved(ctx sdk.Context, _ sdk.ConsAddress, _ sdk.ValAddress) error {`
	`22`	`+func (h Hooks) AfterValidatorRemoved(ctx sdk.Context, _ sdk.ConsAddress, valAddr sdk.ValAddress) error {`
	`23`	`+ h.k.DeleteValidatorInfo(ctx, valAddr)`
`23`	`24`	`h.k.QueueAssetRebalanceEvent(ctx)`
`24`	`25`	`return nil`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,3 +72,9 @@ func (k Keeper) GetAllAllianceValidatorInfo(ctx sdk.Context) []types.AllianceVal`
`72`	`72`	`}`
`73`	`73`	`return infos`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+func (k Keeper) DeleteValidatorInfo(ctx sdk.Context, valAddr sdk.ValAddress) {`
	`77`	`+ store := ctx.KVStore(k.storeKey)`
	`78`	`+ key := types.GetAllianceValidatorInfoKey(valAddr)`
	`79`	`+ store.Delete(key)`
	`80`	`+}`