factory: simplify validator and genesis factory functions (#7305)

internal/test/factory/validator.go

@@ -2,8 +2,6 @@ package factory
 
 import (
 	"context"
-	"fmt"
-	"math/rand"
 	"sort"
 	"testing"
 
@@ -11,23 +9,18 @@ import (
 	"github.com/tendermint/tendermint/types"
 )
 
-func RandValidator(ctx context.Context, randPower bool, minPower int64) (*types.Validator, types.PrivValidator, error) {
+func Validator(votingPower int64) (*types.Validator, types.PrivValidator, error) {
 	privVal := types.NewMockPV()
-	votePower := minPower
-	if randPower {
-		// nolint:gosec // G404: Use of weak random number generator
-		votePower += int64(rand.Uint32())
-	}
-	pubKey, err := privVal.GetPubKey(ctx)
+	pubKey, err := privVal.GetPubKey(context.Background())
 	if err != nil {
-		return nil, nil, fmt.Errorf("could not retrieve public key: %w", err)
+		return nil, nil, err
 	}
 
-	val := types.NewValidator(pubKey, votePower)
-	return val, privVal, err
+	val := types.NewValidator(pubKey, votingPower)
+	return val, privVal, nil
 }
 
-func RandValidatorSet(ctx context.Context, t *testing.T, numValidators int, votingPower int64) (*types.ValidatorSet, []types.PrivValidator) {
+func ValidatorSet(t *testing.T, numValidators int, votingPower int64) (*types.ValidatorSet, []types.PrivValidator) {
 	var (
 		valz           = make([]*types.Validator, numValidators)
 		privValidators = make([]types.PrivValidator, numValidators)
@@ -35,7 +28,7 @@ func RandValidatorSet(ctx context.Context, t *testing.T, numValidators int, voti
 	t.Helper()
 
 	for i := 0; i < numValidators; i++ {
-		val, privValidator, err := RandValidator(ctx, false, votingPower)
+		val, privValidator, err := Validator(votingPower)
 		require.NoError(t, err)
 		valz[i] = val
 		privValidators[i] = privValidator