x/staking: lazily get consensus key address (#9264)

cosmos · May 5, 2021 · d9b2012 · d9b2012
1 parent 1e1c812
commit d9b2012
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/x/staking/genesis.go b/x/staking/genesis.go
@@ -237,17 +237,22 @@ func validateGenesisStateValidators(validators []types.Validator) error {
 		if err != nil {
 			return err
 		}
-		consAddr, err := val.GetConsAddr()
-		if err != nil {
-			return err
-		}
+
 		strKey := string(consPk.Bytes())
 
 		if _, ok := addrMap[strKey]; ok {
+			consAddr, err := val.GetConsAddr()
+			if err != nil {
+				return err
+			}
 			return fmt.Errorf("duplicate validator in genesis state: moniker %v, address %v", val.Description.Moniker, consAddr)
 		}
 
 		if val.Jailed && val.IsBonded() {
+			consAddr, err := val.GetConsAddr()
+			if err != nil {
+				return err
+			}
 			return fmt.Errorf("validator is bonded and jailed in genesis state: moniker %v, address %v", val.Description.Moniker, consAddr)
 		}