From a6b112ad1e8ad5166062703371a0808d757a8311 Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Tue, 10 Dec 2024 15:44:46 +0000 Subject: [PATCH] Update staticcheck version (#5071) Signed-off-by: Mark S. Lewis --- cmd/configtxlator/main.go | 3 --- core/chaincode/accesscontrol/access.go | 2 +- core/common/validation/msgvalidation.go | 4 ++-- .../privacyenabledstate/snapshot_test.go | 3 +-- core/scc/qscc/query_test.go | 18 +++++++++--------- gotools.mk | 2 +- internal/peer/chaincode/invoke_test.go | 2 +- orderer/consensus/smartbft/configverifier.go | 2 +- 8 files changed, 16 insertions(+), 20 deletions(-) diff --git a/cmd/configtxlator/main.go b/cmd/configtxlator/main.go index 90d8f75da73..75995f8490d 100644 --- a/cmd/configtxlator/main.go +++ b/cmd/configtxlator/main.go @@ -220,9 +220,6 @@ func computeUpdt(original, updated, output *os.File, channelID string) error { cu.ChannelId = channelID - if cu == nil { - return errors.New("error marshaling computed config update: proto: Marshal called with nil") - } outBytes, err := proto.Marshal(cu) if err != nil { return errors.Wrapf(err, "error marshaling computed config update") diff --git a/core/chaincode/accesscontrol/access.go b/core/chaincode/accesscontrol/access.go index 83394e6a5f1..1f1dd24068f 100644 --- 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/common/validation/msgvalidation.go b/core/common/validation/msgvalidation.go index 295b19bf8b6..c4c9eeb40de 100644 --- 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/ledger/kvledger/txmgmt/privacyenabledstate/snapshot_test.go b/core/ledger/kvledger/txmgmt/privacyenabledstate/snapshot_test.go index 90dbdf586b7..f9962dbe068 100644 --- a/core/ledger/kvledger/txmgmt/privacyenabledstate/snapshot_test.go +++ b/core/ledger/kvledger/txmgmt/privacyenabledstate/snapshot_test.go @@ -23,7 +23,6 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/encoding/protowire" "google.golang.org/protobuf/proto" - protoV2 "google.golang.org/protobuf/proto" "google.golang.org/protobuf/protoadapt" ) @@ -567,7 +566,7 @@ func TestSnapshotImportErrorPropagation(t *testing.T) { srTmp := protoadapt.MessageV2Of(sr) var buf []byte buf = protowire.AppendVarint(buf, uint64(proto.Size(sr))) - nbuf, err := protoV2.MarshalOptions{ + nbuf, err := proto.MarshalOptions{ Deterministic: false, AllowPartial: true, }.MarshalAppend(buf, srTmp) diff --git a/core/scc/qscc/query_test.go b/core/scc/qscc/query_test.go index da4f4d2ed43..f92f0af4f96 100644 --- a/core/scc/qscc/query_test.go +++ b/core/scc/qscc/query_test.go @@ -96,7 +96,7 @@ func TestQueryGetChainInfo(t *testing.T) { mockStub, lq, _, cleanup, err := setupTestLedger(t, chainid, path) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } defer cleanup() @@ -128,7 +128,7 @@ func TestQueryGetTransactionByID(t *testing.T) { mockStub, lq, _, cleanup, err := setupTestLedger(t, chainid, path) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } defer cleanup() @@ -164,7 +164,7 @@ func TestQueryGetBlockByNumber(t *testing.T) { mockStub, lq, _, cleanup, err := setupTestLedger(t, chainid, path) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } defer cleanup() @@ -201,7 +201,7 @@ func TestQueryGetBlockByHash(t *testing.T) { mockStub, lq, _, cleanup, err := setupTestLedger(t, chainid, path) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } defer cleanup() @@ -228,7 +228,7 @@ func TestQueryGetBlockByTxID(t *testing.T) { mockStub, lq, _, cleanup, err := setupTestLedger(t, chainid, path) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } defer cleanup() @@ -290,7 +290,7 @@ func TestFailingAccessControl(t *testing.T) { mockStub, lq, _, cleanup, err := setupTestLedger(t, chainid, path) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } defer cleanup() @@ -415,7 +415,7 @@ func TestQueryNonexistentFunction(t *testing.T) { mockStub, lq, _, cleanup, err := setupTestLedger(t, chainid, path) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } defer cleanup() @@ -436,7 +436,7 @@ func TestQueryGeneratedBlock(t *testing.T) { mockStub, lq, p, cleanup, err := setupTestLedger(t, chainid, path) if err != nil { - t.Fatalf(err.Error()) + t.Fatal(err.Error()) } defer cleanup() @@ -471,7 +471,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/gotools.mk b/gotools.mk index fbfbfcaa526..31fde2b0261 100644 --- a/gotools.mk +++ b/gotools.mk @@ -21,7 +21,7 @@ go.fqp.misspell := github.com/client9/misspell/cmd/misspell go.fqp.mockery := github.com/vektra/mockery/cmd/mockery go.fqp.protoc-gen-go := google.golang.org/protobuf/cmd/protoc-gen-go go.fqp.protoc-gen-go-grpc := google.golang.org/grpc/cmd/protoc-gen-go-grpc -go.fqp.staticcheck := honnef.co/go/tools/cmd/staticcheck@2023.1.7 +go.fqp.staticcheck := honnef.co/go/tools/cmd/staticcheck@2024.1.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 index 07e148341db..2aaf96381dc 100644 --- a/internal/peer/chaincode/invoke_test.go +++ b/internal/peer/chaincode/invoke_test.go @@ -391,7 +391,7 @@ func getMockDeliverClientRespondAfterDelay(delayChan chan struct{}, txStatus pb. func getMockDeliverClientWithErr(errMsg string) *mock.PeerDeliverClient { mockDC := &mock.PeerDeliverClient{} mockDC.DeliverFilteredStub = func(ctx context.Context, opts ...grpc.CallOption) (pb.Deliver_DeliverFilteredClient, error) { - return nil, fmt.Errorf(errMsg) + return nil, errors.New(errMsg) } return mockDC } diff --git a/orderer/consensus/smartbft/configverifier.go b/orderer/consensus/smartbft/configverifier.go index 7d689aa0120..6238dd438d4 100644 --- a/orderer/consensus/smartbft/configverifier.go +++ b/orderer/consensus/smartbft/configverifier.go @@ -152,7 +152,7 @@ func (cbv *ConfigBlockValidator) checkConsentersMatchPolicy(conf *cb.Config) err Value: protoutil.MarshalOrPanic(sp), } - if conf.ChannelGroup.Groups["Orderer"].Policies == nil || len(conf.ChannelGroup.Groups["Orderer"].Policies) == 0 { + if len(conf.ChannelGroup.Groups["Orderer"].Policies) == 0 { return fmt.Errorf("empty policies in 'Orderer' group") }