exec go fix (#5406)

Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>

Author: pfi79

cmd/common/cli.go

@@ -152,6 +152,6 @@ func evaluateFileFlag(f **os.File) string {
 	return path
 }
 
-func out(a ...interface{}) {
+func out(a ...any) {
 	fmt.Fprintln(outWriter, a...)
 }

cmd/cryptogen/main.go

@@ -420,7 +420,7 @@ func generate() {
 	}
 }
 
-func parseTemplate(input string, data interface{}) (string, error) {
+func parseTemplate(input string, data any) (string, error) {
 	t, err := template.New("parse").Parse(input)
 	if err != nil {
 		return "", fmt.Errorf("Error parsing template: %s", err)
@@ -435,7 +435,7 @@ func parseTemplate(input string, data interface{}) (string, error) {
 	return output.String(), nil
 }
 
-func parseTemplateWithDefault(input, defaultInput string, data interface{}) (string, error) {
+func parseTemplateWithDefault(input, defaultInput string, data any) (string, error) {
 	// Use the default if the input is an empty string
 	if len(input) == 0 {
 		input = defaultInput

cmd/osnadmin/main_test.go

@@ -1061,15 +1061,15 @@ var _ = Describe("osnadmin", func() {
 	})
 })
 
-func checkStatusOutput(output string, exit int, err error, expectedStatus int, expectedOutput interface{}) {
+func checkStatusOutput(output string, exit int, err error, expectedStatus int, expectedOutput any) {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(exit).To(Equal(0))
 	json, err := json.MarshalIndent(expectedOutput, "", "\t")
 	Expect(err).NotTo(HaveOccurred())
 	Expect(output).To(Equal(fmt.Sprintf("Status: %d\n%s\n", expectedStatus, string(json))))
 }
 
-func checkOutput(output string, exit int, err error, expectedOutput interface{}) {
+func checkOutput(output string, exit int, err error, expectedOutput any) {
 	Expect(err).NotTo(HaveOccurred())
 	Expect(exit).To(Equal(0))
 	json, err := json.MarshalIndent(expectedOutput, "", "\t")

cmd/peer/main_test.go

@@ -57,7 +57,6 @@ func TestPluginLoadingFailure(t *testing.T) {
 		"ENDORSERS_ESCC",
 		"VALIDATORS_VSCC",
 	} {
-		plugin := plugin
 		t.Run(plugin, func(t *testing.T) {
 			cmd := exec.Command(peer, "node", "start")
 			cmd.Env = []string{

common/channelconfig/standardvalues.go

@@ -15,7 +15,7 @@ import (
 )
 
 // DeserializeProtoValuesFromGroup deserializes the value for all values in a config group
-func DeserializeProtoValuesFromGroup(group *cb.ConfigGroup, protosStructs ...interface{}) error {
+func DeserializeProtoValuesFromGroup(group *cb.ConfigGroup, protosStructs ...any) error {
 	sv, err := NewStandardValues(protosStructs...)
 	if err != nil {
 		logger.Panicf("This is a compile time bug only, the proto structures are somehow invalid: %s", err)
@@ -38,7 +38,7 @@ type StandardValues struct {
 // the same condition.  NewStandard values will instantiate memory for all the proto
 // messages and build a lookup map from structure field name to proto message instance
 // This is a useful way to easily implement the Values interface
-func NewStandardValues(protosStructs ...interface{}) (*StandardValues, error) {
+func NewStandardValues(protosStructs ...any) (*StandardValues, error) {
 	sv := &StandardValues{
 		lookup: make(map[string]proto.Message),
 	}
@@ -72,19 +72,19 @@ func (sv *StandardValues) Deserialize(key string, value []byte) (proto.Message,
 
 func (sv *StandardValues) initializeProtosStruct(objValue reflect.Value) error {
 	objType := objValue.Type()
-	if objType.Kind() != reflect.Ptr {
+	if objType.Kind() != reflect.Pointer {
 		return fmt.Errorf("Non pointer type")
 	}
 	if objType.Elem().Kind() != reflect.Struct {
 		return fmt.Errorf("Non struct type")
 	}
 
 	numFields := objValue.Elem().NumField()
-	for i := 0; i < numFields; i++ {
+	for i := range numFields {
 		structField := objType.Elem().Field(i)
 		logger.Debugf("Processing field: %s\n", structField.Name)
 		switch structField.Type.Kind() {
-		case reflect.Ptr:
+		case reflect.Pointer:
 			fieldPtr := objValue.Elem().Field(i)
 			if !fieldPtr.CanSet() {
 				return fmt.Errorf("Cannot set structure field %s (unexported?)", structField.Name)

common/channelconfig/util_test.go

@@ -351,7 +351,7 @@ func TestMarshalEtcdRaftMetadata(t *testing.T) {
 		inputCerts[i], _ = os.ReadFile(fmt.Sprintf("testdata/tls-client-%d.pem", i+1))
 	}
 
-	for i := 0; i < len(inputCerts)-1; i++ {
+	for i := range len(inputCerts) - 1 {
 		require.NotEqual(t, outputCerts[i+1], outputCerts[i], "expected extracted certs to differ from each other")
 	}
 }

common/crypto/expiration.go

@@ -42,7 +42,7 @@ func certExpirationTime(pemBytes []byte) time.Time {
 }
 
 // MessageFunc notifies a message happened with the given format, and can be replaced with Warnf or Infof of a logger.
-type MessageFunc func(format string, args ...interface{})
+type MessageFunc func(format string, args ...any)
 
 // Scheduler invokes f after d time, and can be replaced with time.AfterFunc.
 type Scheduler func(d time.Duration, f func()) *time.Timer
@@ -104,7 +104,7 @@ func trackCertExpiration(rawCert []byte, certRole string, info MessageFunc, warn
 var ErrPubKeyMismatch = errors.New("public keys do not match")
 
 // LogNonPubKeyMismatchErr logs an error which is not an ErrPubKeyMismatch error
-func LogNonPubKeyMismatchErr(log func(template string, args ...interface{}), err error, cert1DER, cert2DER []byte) {
+func LogNonPubKeyMismatchErr(log func(template string, args ...any), err error, cert1DER, cert2DER []byte) {
 	cert1PEM := &pem.Block{Type: "CERTIFICATE", Bytes: cert1DER}
 	cert2PEM := &pem.Block{Type: "CERTIFICATE", Bytes: cert2DER}
 	log("Failed determining if public key of %s matches public key of %s: %s",

common/crypto/expiration_test.go

@@ -91,17 +91,17 @@ func TestTrackExpiration(t *testing.T) {
 		IdBytes: tlsCert.Cert,
 	})
 
-	warnShouldNotBeInvoked := func(format string, args ...interface{}) {
+	warnShouldNotBeInvoked := func(format string, args ...any) {
 		t.Fatalf(format, args...)
 	}
 
 	var formattedWarning string
-	warnShouldBeInvoked := func(format string, args ...interface{}) {
+	warnShouldBeInvoked := func(format string, args ...any) {
 		formattedWarning = fmt.Sprintf(format, args...)
 	}
 
 	var formattedInfo string
-	infoShouldBeInvoked := func(format string, args ...interface{}) {
+	infoShouldBeInvoked := func(format string, args ...any) {
 		formattedInfo = fmt.Sprintf(format, args...)
 	}
 
@@ -225,7 +225,7 @@ func TestLogNonPubKeyMismatchErr(t *testing.T) {
 		string(bobKeyPair.Cert)))
 
 	b := &bytes.Buffer{}
-	f := func(template string, args ...interface{}) {
+	f := func(template string, args ...any) {
 		fmt.Fprintf(b, template, args...)
 	}
 

common/deliver/acl_test.go

@@ -70,7 +70,7 @@ var _ = Describe("SessionAccessControl", func() {
 		sac, err := deliver.NewSessionAC(fakeChain, envelope, fakePolicyChecker, "chain-id", expiresAt)
 		Expect(err).NotTo(HaveOccurred())
 
-		for i := 0; i < 5; i++ {
+		for range 5 {
 			err = sac.Evaluate()
 			Expect(err).NotTo(HaveOccurred())
 		}

common/deliver/deliver_test.go

@@ -369,7 +369,7 @@ var _ = Describe("Deliver", func() {
 				Expect(err).NotTo(HaveOccurred())
 
 				Expect(fakeResponseSender.SendBlockResponseCallCount()).To(Equal(5))
-				for i := 0; i < 5; i++ {
+				for i := range 5 {
 					b, _, _, _ := fakeResponseSender.SendBlockResponseArgsForCall(i)
 					Expect(b).To(Equal(&cb.Block{
 						Header: &cb.BlockHeader{Number: 995 + uint64(i)},
@@ -393,7 +393,7 @@ var _ = Describe("Deliver", func() {
 
 				Expect(fakeBlocksSent.AddCallCount()).To(Equal(5))
 				Expect(fakeBlocksSent.WithCallCount()).To(Equal(5))
-				for i := 0; i < 5; i++ {
+				for i := range 5 {
 					Expect(fakeBlocksSent.AddArgsForCall(i)).To(BeNumerically("~", 1.0))
 					labelValues := fakeBlocksSent.WithArgsForCall(i)
 					Expect(labelValues).To(Equal([]string{