bump go to 1.24.2

pfi79 · pfi79 · commit e303798a5684 · 2025-04-10T23:41:50.000+03:00
Signed-off-by: Fedor Partanskiy &lt;fredprtnsk@gmail.com&gt;
diff --git a/bccsp/sw/keyimport_test.go b/bccsp/sw/keyimport_test.go
@@ -123,7 +123,8 @@ func TestECDSAPKIXPublicKeyImportOptsKeyImporter(t *testing.T) {
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "Failed converting PKIX to ECDSA public key [")
 
-	k, err := rsa.GenerateKey(rand.Reader, 512)
+	// https://go.dev/issue/68762
+	k, err := rsa.GenerateKey(rand.Reader, 1024)
 	require.NoError(t, err)
 	raw, err := x509.MarshalPKIXPublicKey(&k.PublicKey)
 	require.NoError(t, err)
@@ -153,7 +154,8 @@ func TestECDSAPrivateKeyImportOptsKeyImporter(t *testing.T) {
 	require.Error(t, err)
 	require.Contains(t, err.Error(), "Failed converting PKIX to ECDSA public key")
 
-	k, err := rsa.GenerateKey(rand.Reader, 512)
+	// https://go.dev/issue/68762
+	k, err := rsa.GenerateKey(rand.Reader, 1024)
 	require.NoError(t, err)
 	raw := x509.MarshalPKCS1PrivateKey(k)
 	_, err = ki.KeyImport(raw, &mocks2.KeyImportOpts{})
diff --git a/common/flogging/fabenc/formatter_test.go b/common/flogging/fabenc/formatter_test.go
@@ -75,7 +75,7 @@ func TestParseFormat(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		t.Run(fmt.Sprintf(tc.desc), func(t *testing.T) {
+		t.Run(tc.desc, func(t *testing.T) {
 			formatters, err := fabenc.ParseFormat(tc.spec)
 			require.NoError(t, err)
 			require.Equal(t, tc.formatters, formatters)
diff --git a/common/flogging/zap.go b/common/flogging/zap.go
@@ -58,19 +58,19 @@ type FabricLogger struct{ s *zap.SugaredLogger }
 func (f *FabricLogger) DPanic(args ...interface{})                    { f.s.DPanicf(formatArgs(args)) }
 func (f *FabricLogger) DPanicf(template string, args ...interface{})  { f.s.DPanicf(template, args...) }
 func (f *FabricLogger) DPanicw(msg string, kvPairs ...interface{})    { f.s.DPanicw(msg, kvPairs...) }
-func (f *FabricLogger) Debug(args ...interface{})                     { f.s.Debugf(formatArgs(args)) }
+func (f *FabricLogger) Debug(args ...interface{})                     { f.s.Debug(formatArgs(args)) }
 func (f *FabricLogger) Debugf(template string, args ...interface{})   { f.s.Debugf(template, args...) }
 func (f *FabricLogger) Debugw(msg string, kvPairs ...interface{})     { f.s.Debugw(msg, kvPairs...) }
-func (f *FabricLogger) Error(args ...interface{})                     { f.s.Errorf(formatArgs(args)) }
+func (f *FabricLogger) Error(args ...interface{})                     { f.s.Error(formatArgs(args)) }
 func (f *FabricLogger) Errorf(template string, args ...interface{})   { f.s.Errorf(template, args...) }
 func (f *FabricLogger) Errorw(msg string, kvPairs ...interface{})     { f.s.Errorw(msg, kvPairs...) }
-func (f *FabricLogger) Fatal(args ...interface{})                     { f.s.Fatalf(formatArgs(args)) }
+func (f *FabricLogger) Fatal(args ...interface{})                     { f.s.Fatal(formatArgs(args)) }
 func (f *FabricLogger) Fatalf(template string, args ...interface{})   { f.s.Fatalf(template, args...) }
 func (f *FabricLogger) Fatalw(msg string, kvPairs ...interface{})     { f.s.Fatalw(msg, kvPairs...) }
-func (f *FabricLogger) Info(args ...interface{})                      { f.s.Infof(formatArgs(args)) }
+func (f *FabricLogger) Info(args ...interface{})                      { f.s.Info(formatArgs(args)) }
 func (f *FabricLogger) Infof(template string, args ...interface{})    { f.s.Infof(template, args...) }
 func (f *FabricLogger) Infow(msg string, kvPairs ...interface{})      { f.s.Infow(msg, kvPairs...) }
-func (f *FabricLogger) Panic(args ...interface{})                     { f.s.Panicf(formatArgs(args)) }
+func (f *FabricLogger) Panic(args ...interface{})                     { f.s.Panic(formatArgs(args)) }
 func (f *FabricLogger) Panicf(template string, args ...interface{})   { f.s.Panicf(template, args...) }
 func (f *FabricLogger) Panicw(msg string, kvPairs ...interface{})     { f.s.Panicw(msg, kvPairs...) }
 func (f *FabricLogger) Warn(args ...interface{})                      { f.s.Warnf(formatArgs(args)) }
@@ -80,9 +80,9 @@ func (f *FabricLogger) Warning(args ...interface{})                   { f.s.Warn
 func (f *FabricLogger) Warningf(template string, args ...interface{}) { f.s.Warnf(template, args...) }
 
 // for backwards compatibility
-func (f *FabricLogger) Critical(args ...interface{})                   { f.s.Errorf(formatArgs(args)) }
+func (f *FabricLogger) Critical(args ...interface{})                   { f.s.Error(formatArgs(args)) }
 func (f *FabricLogger) Criticalf(template string, args ...interface{}) { f.s.Errorf(template, args...) }
-func (f *FabricLogger) Notice(args ...interface{})                     { f.s.Infof(formatArgs(args)) }
+func (f *FabricLogger) Notice(args ...interface{})                     { f.s.Info(formatArgs(args)) }
 func (f *FabricLogger) Noticef(template string, args ...interface{})   { f.s.Infof(template, args...) }
 
 func (f *FabricLogger) Named(name string) *FabricLogger { return &FabricLogger{s: f.s.Named(name)} }
diff --git a/common/policies/implicitmeta.go b/common/policies/implicitmeta.go
@@ -83,7 +83,7 @@ func (imp *ImplicitMetaPolicy) EvaluateSignedData(signatureSet []*protoutil.Sign
 					b.WriteString(" ")
 				}
 				b.WriteString("]")
-				logger.Debugf(b.String())
+				logger.Debug(b.String())
 			}
 		}
 	}()
@@ -126,7 +126,7 @@ func (imp *ImplicitMetaPolicy) EvaluateIdentities(identities []msp.Identity) err
 			b.WriteString(" ")
 		}
 		b.WriteString("]")
-		logger.Debugf(b.String())
+		logger.Debug(b.String())
 	}()
 
 	for _, policy := range imp.SubPolicies {
diff --git a/core/chaincode/accesscontrol/access.go b/core/chaincode/accesscontrol/access.go
@@ -87,7 +87,7 @@ func (ac *Authenticator) authenticate(msg *pb.ChaincodeMessage, stream grpc.Serv
 	if registeredName != ccName {
 		errMsg := fmt.Sprintf("Chaincode %s with given certificate hash %v belongs to a different chaincode", ccName, hash)
 		logger.Warning(errMsg)
-		return fmt.Errorf(errMsg)
+		return errors.New(errMsg)
 	}
 
 	logger.Debug("Chaincode", ccName, "'s authentication is authorized")
diff --git a/core/committer/txvalidator/v14/vscc_validator.go b/core/committer/txvalidator/v14/vscc_validator.go
@@ -345,8 +345,7 @@ func (v *VsccValidatorImpl) GetInfoForValidate(chdr *common.ChannelHeader, ccID
 		// obtain name of the VSCC and the policy
 		cd, err := v.getCDataForCC(chdr.ChannelId, ccID)
 		if err != nil {
-			msg := fmt.Sprintf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err)
-			logger.Errorf(msg)
+			logger.Errorf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err)
 			return nil, nil, nil, err
 		}
 		cc.ChaincodeName = cd.Name
diff --git a/core/committer/txvalidator/v20/plugindispatcher/dispatcher.go b/core/committer/txvalidator/v20/plugindispatcher/dispatcher.go
@@ -267,8 +267,7 @@ func (v *dispatcherImpl) GetInfoForValidate(chdr *common.ChannelHeader, ccID str
 	// obtain name of the validation plugin and the policy
 	plugin, args, err := v.getCDataForCC(chdr.ChannelId, ccID)
 	if err != nil {
-		msg := fmt.Sprintf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err)
-		logger.Errorf(msg)
+		logger.Errorf("Unable to get chaincode data from ledger for txid %s, due to %s", chdr.TxId, err)
 		return "", nil, err
 	}
 	return plugin, args, nil
diff --git a/core/common/validation/msgvalidation.go b/core/common/validation/msgvalidation.go
@@ -71,12 +71,12 @@ func validateSignatureHeader(sHdr *common.SignatureHeader) error {
 	}
 
 	// ensure that there is a nonce
-	if sHdr.Nonce == nil || len(sHdr.Nonce) == 0 {
+	if len(sHdr.Nonce) == 0 {
 		return errors.New("invalid nonce specified in the header")
 	}
 
 	// ensure that there is a creator
-	if sHdr.Creator == nil || len(sHdr.Creator) == 0 {
+	if len(sHdr.Creator) == 0 {
 		return errors.New("invalid creator specified in the header")
 	}
 
diff --git a/core/common/validation/statebased/validator_keylevel.go b/core/common/validation/statebased/validator_keylevel.go
@@ -52,7 +52,7 @@ func (p *baseEvaluator) checkSBAndCCEP(cc, coll, key string, blockNum, txNum uin
 		//    logged and ignored. The ledger will take the most appropriate action
 		//    when performing its side of the validation.
 		case *ledger.CollConfigNotDefinedError, *ledger.InvalidCollNameError:
-			logger.Warningf(errors.WithMessage(err, "skipping key-level validation").Error())
+			logger.Warning(errors.WithMessage(err, "skipping key-level validation").Error())
 		// 3) any other type of error should return an execution failure which will
 		//    lead to halting the processing on this channel. Note that any non-categorized
 		//    deterministic error would be caught by the default and would lead to
diff --git a/core/common/validation/statebased/vpmanagerimpl.go b/core/common/validation/statebased/vpmanagerimpl.go
@@ -306,7 +306,7 @@ func (m *KeyLevelValidationParameterManagerImpl) GetValidationParameterForKey(cc
 	// bail, if the validation parameter has been updated in the meantime
 	err := vCtx.waitForValidationResults(newLedgerKeyID(cc, coll, key), blockNum, txNum)
 	if err != nil {
-		logger.Errorf(err.Error())
+		logger.Error(err.Error())
 		return nil, err
 	}
 
@@ -316,7 +316,7 @@ func (m *KeyLevelValidationParameterManagerImpl) GetValidationParameterForKey(cc
 	state, err := m.StateFetcher.FetchState()
 	if err != nil {
 		err = errors.WithMessage(err, "could not retrieve ledger")
-		logger.Errorf(err.Error())
+		logger.Error(err.Error())
 		return nil, err
 	}
 	defer state.Done()
@@ -326,14 +326,14 @@ func (m *KeyLevelValidationParameterManagerImpl) GetValidationParameterForKey(cc
 		mdMap, err = state.GetStateMetadata(cc, key)
 		if err != nil {
 			err = errors.WithMessagef(err, "could not retrieve metadata for %s:%s", cc, key)
-			logger.Errorf(err.Error())
+			logger.Error(err.Error())
 			return nil, err
 		}
 	} else {
 		mdMap, err = state.GetPrivateDataMetadataByHash(cc, coll, []byte(key))
 		if err != nil {
 			err = errors.WithMessagef(err, "could not retrieve metadata for %s:%s:%x", cc, coll, []byte(key))
-			logger.Errorf(err.Error())
+			logger.Error(err.Error())
 			return nil, err
 		}
 	}
diff --git a/core/deliverservice/deliveryclient.go b/core/deliverservice/deliveryclient.go
@@ -108,12 +108,12 @@ func (d *deliverServiceImpl) StartDeliverForChannel(chainID string, ledgerInfo b
 	defer d.lock.Unlock()
 	if d.stopping {
 		errMsg := fmt.Sprintf("Delivery service is stopping cannot join a new channel %s", chainID)
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return errors.New(errMsg)
 	}
 	if _, exist := d.blockProviders[chainID]; exist {
 		errMsg := fmt.Sprintf("Delivery service - block provider already exists for %s found, can't start delivery", chainID)
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return errors.New(errMsg)
 	}
 
@@ -169,13 +169,13 @@ func (d *deliverServiceImpl) StopDeliverForChannel(chainID string) error {
 	defer d.lock.Unlock()
 	if d.stopping {
 		errMsg := fmt.Sprintf("Delivery service is stopping, cannot stop delivery for channel %s", chainID)
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return errors.New(errMsg)
 	}
 	client, exist := d.blockProviders[chainID]
 	if !exist {
 		errMsg := fmt.Sprintf("Delivery service - no block provider for %s found, can't stop delivery", chainID)
-		logger.Errorf(errMsg)
+		logger.Error(errMsg)
 		return errors.New(errMsg)
 	}
 	client.Stop()
diff --git a/core/handlers/library/plugin.go b/core/handlers/library/plugin.go
@@ -10,7 +10,6 @@
 package library
 
 import (
-	"fmt"
 	"os"
 	"plugin"
 
@@ -23,11 +22,11 @@ import (
 // loadPlugin loads a pluggable handler
 func (r *registry) loadPlugin(pluginPath string, handlerType HandlerType, extraArgs ...string) {
 	if _, err := os.Stat(pluginPath); err != nil {
-		logger.Panicf(fmt.Sprintf("Could not find plugin at path %s: %s", pluginPath, err))
+		logger.Panicf("Could not find plugin at path %s: %s", pluginPath, err)
 	}
 	p, err := plugin.Open(pluginPath)
 	if err != nil {
-		logger.Panicf(fmt.Sprintf("Error opening plugin at path %s: %s", pluginPath, err))
+		logger.Panicf("Error opening plugin at path %s: %s", pluginPath, err)
 	}
 
 	if handlerType == Auth {
diff --git a/core/handlers/library/registry.go b/core/handlers/library/registry.go
@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
 package library
 
 import (
-	"fmt"
 	"reflect"
 	"sync"
 
@@ -104,7 +103,7 @@ func (r *registry) loadCompiled(handlerFactory string, handlerType HandlerType,
 
 	o := registryMD.MethodByName(handlerFactory)
 	if !o.IsValid() {
-		logger.Panicf(fmt.Sprintf("Method %s isn't a method of HandlerLibrary", handlerFactory))
+		logger.Panicf("Method %s isn't a method of HandlerLibrary", handlerFactory)
 	}
 
 	inst := o.Call(nil)[0].Interface()
diff --git a/core/ledger/kvledger/kv_ledger_provider.go b/core/ledger/kvledger/kv_ledger_provider.go
@@ -312,7 +312,7 @@ func (p *Provider) deleteUnderConstructionLedger(ledger ledger.PeerLedger, ledge
 	if cleanupErr == nil {
 		return creationErr
 	}
-	return errors.WithMessagef(cleanupErr, creationErr.Error())
+	return errors.WithMessage(cleanupErr, creationErr.Error())
 }
 
 // Open implements the corresponding method from interface ledger.PeerLedgerProvider
diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/commit_handling.go b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/commit_handling.go
@@ -224,7 +224,7 @@ func (c *committer) commitUpdates() error {
 			errorString := fmt.Sprintf("error saving document ID: %v. Error: %s,  Reason: %s",
 				resp.ID, resp.Error, resp.Reason)
 
-			logger.Errorf(errorString)
+			logger.Error(errorString)
 			return errors.WithMessage(err, errorString)
 		}
 	}
diff --git a/core/ledger/kvledger/txmgmt/statedb/statecouchdb/couchdb.go b/core/ledger/kvledger/txmgmt/statedb/statecouchdb/couchdb.go
@@ -646,7 +646,7 @@ func createAttachmentPart(couchDoc *couchDoc) (bytes.Buffer, string, error) {
 		return *writeBuffer, "", errors.Wrap(err, "error marshalling json data")
 	}
 
-	couchdbLogger.Debugf(string(filesForUpload))
+	couchdbLogger.Debug(string(filesForUpload))
 
 	// create the header for the JSON
 	header := make(textproto.MIMEHeader)
diff --git a/core/peer/deliverevents.go b/core/peer/deliverevents.go
@@ -341,7 +341,7 @@ func (block *blockEvent) toFilteredBlock() (*peer.FilteredBlock, error) {
 
 			filteredTransaction.Data, err = transactionActions(tx.Actions).toFilteredActions()
 			if err != nil {
-				logger.Errorf(err.Error())
+				logger.Error(err.Error())
 				return nil, err
 			}
 		}
diff --git a/core/scc/qscc/query_test.go b/core/scc/qscc/query_test.go
@@ -102,7 +102,7 @@ func TestQueryGetChainInfo(t *testing.T) {
 
 	stub, _, cleanup, err := setupTestLedger(chainid, path)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanup()
 
@@ -127,7 +127,7 @@ func TestQueryGetTransactionByID(t *testing.T) {
 
 	stub, _, cleanup, err := setupTestLedger(chainid, path)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanup()
 
@@ -153,7 +153,7 @@ func TestQueryGetBlockByNumber(t *testing.T) {
 
 	stub, _, cleanup, err := setupTestLedger(chainid, path)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanup()
 
@@ -181,7 +181,7 @@ func TestQueryGetBlockByHash(t *testing.T) {
 
 	stub, _, cleanup, err := setupTestLedger(chainid, path)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanup()
 
@@ -202,7 +202,7 @@ func TestQueryGetBlockByTxID(t *testing.T) {
 
 	stub, _, cleanup, err := setupTestLedger(chainid, path)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanup()
 
@@ -256,7 +256,7 @@ func TestFailingAccessControl(t *testing.T) {
 
 	_, p, cleanup, err := setupTestLedger(chainid, path)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanup()
 	e := &LedgerQuerier{
@@ -377,7 +377,7 @@ func TestQueryNonexistentFunction(t *testing.T) {
 
 	stub, _, cleanup, err := setupTestLedger(chainid, path)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanup()
 
@@ -396,7 +396,7 @@ func TestQueryGeneratedBlock(t *testing.T) {
 
 	stub, p, cleanup, err := setupTestLedger(chainid, path)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	defer cleanup()
 
@@ -427,7 +427,7 @@ func TestQueryGeneratedBlock(t *testing.T) {
 				}
 				chdr, err := protoutil.UnmarshalChannelHeader(payload.Header.ChannelHeader)
 				if err != nil {
-					t.Fatalf(err.Error())
+					t.Fatal(err.Error())
 				}
 				if common.HeaderType(chdr.Type) == common.HeaderType_ENDORSER_TRANSACTION {
 					args = [][]byte{[]byte(GetBlockByTxID), []byte(chainid), []byte(chdr.TxId)}
diff --git a/docs/source/prereqs.md b/docs/source/prereqs.md
@@ -79,9 +79,9 @@ Optional: Install the latest Fabric supported version of [Go](https://golang.org
 installed (only required if you will be writing Go chaincode or SDK applications).
 
 ```shell
-$ brew install go@1.23.7
+$ brew install go@1.24.2
 $ go version
-go1.23.7 darwin/amd64
+go1.24.2 darwin/amd64
 ```
 
 ### JQ
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/fabric
 
-go 1.23.7
+go 1.24.2
 
 require (
 	code.cloudfoundry.org/clock v1.0.0
diff --git a/gotools.mk b/gotools.mk
@@ -17,9 +17,10 @@ go.fqp.goimports     := golang.org/x/tools/cmd/goimports
 go.fqp.golint        := golang.org/x/lint/golint
 go.fqp.govulncheck   := golang.org/x/vuln/cmd/govulncheck@latest
 go.fqp.misspell      := github.com/client9/misspell/cmd/misspell
-go.fqp.mockery       := github.com/vektra/mockery/cmd/mockery
+go.fqp.mockery       := github.com/vektra/mockery/v2
 go.fqp.protoc-gen-go := github.com/golang/protobuf/protoc-gen-go
-go.fqp.staticcheck   := honnef.co/go/tools/cmd/staticcheck@2023.1.7
+go.fqp.protoc-gen-go-grpc := google.golang.org/grpc/cmd/protoc-gen-go-grpc
+go.fqp.staticcheck   := honnef.co/go/tools/cmd/staticcheck@2025.1
 go.fqp.swagger       := github.com/go-swagger/go-swagger/cmd/swagger
 
 .PHONY: gotools-install
diff --git a/internal/peer/chaincode/invoke_test.go b/internal/peer/chaincode/invoke_test.go
diff --git a/msp/mgmt/mgmt.go b/msp/mgmt/mgmt.go
diff --git a/orderer/consensus/etcdraft/chain.go b/orderer/consensus/etcdraft/chain.go
diff --git a/tools/go.mod b/tools/go.mod
diff --git a/tools/go.sum b/tools/go.sum
diff --git a/tools/tools.go b/tools/tools.go
diff --git a/vagrant/golang.sh b/vagrant/golang.sh

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func TestParseFormat(t *testing.T) {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`for _, tc := range tests {`
`78`		`- t.Run(fmt.Sprintf(tc.desc), func(t *testing.T) {`
	`78`	`+ t.Run(tc.desc, func(t *testing.T) {`
`79`	`79`	`formatters, err := fabenc.ParseFormat(tc.spec)`
`80`	`80`	`require.NoError(t, err)`
`81`	`81`	`require.Equal(t, tc.formatters, formatters)`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (imp ImplicitMetaPolicy) EvaluateSignedData(signatureSet []protoutil.Sign`
`83`	`83`	`b.WriteString(" ")`
`84`	`84`	`}`
`85`	`85`	`b.WriteString("]")`
`86`		`- logger.Debugf(b.String())`
	`86`	`+ logger.Debug(b.String())`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}()`
`@@ -126,7 +126,7 @@ func (imp *ImplicitMetaPolicy) EvaluateIdentities(identities []msp.Identity) err`
`126`	`126`	`b.WriteString(" ")`
`127`	`127`	`}`
`128`	`128`	`b.WriteString("]")`
`129`		`- logger.Debugf(b.String())`
	`129`	`+ logger.Debug(b.String())`
`130`	`130`	`}()`
`131`	`131`
`132`	`132`	`for _, policy := range imp.SubPolicies {`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (ac Authenticator) authenticate(msg pb.ChaincodeMessage, stream grpc.Serv`
`87`	`87`	`if registeredName != ccName {`
`88`	`88`	`errMsg := fmt.Sprintf("Chaincode %s with given certificate hash %v belongs to a different chaincode", ccName, hash)`
`89`	`89`	`logger.Warning(errMsg)`
`90`		`- return fmt.Errorf(errMsg)`
	`90`	`+ return errors.New(errMsg)`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`logger.Debug("Chaincode", ccName, "'s authentication is authorized")`
Original file line number	Diff line number	Diff line change
`@@ -71,12 +71,12 @@ func validateSignatureHeader(sHdr *common.SignatureHeader) error {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// ensure that there is a nonce`
`74`		`- if sHdr.Nonce == nil \|\| len(sHdr.Nonce) == 0 {`
	`74`	`+ if len(sHdr.Nonce) == 0 {`
`75`	`75`	`return errors.New("invalid nonce specified in the header")`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// ensure that there is a creator`
`79`		`- if sHdr.Creator == nil \|\| len(sHdr.Creator) == 0 {`
	`79`	`+ if len(sHdr.Creator) == 0 {`
`80`	`80`	`return errors.New("invalid creator specified in the header")`
`81`	`81`	`}`
`82`	`82`