Fix lint errors

Signed-off-by: Jim Zhang <jim.zhang@kaleido.io>

Author: jimthematrix

Makefile

@@ -25,8 +25,8 @@ DOCKER_CMD         ?= docker
 DOCKER_COMPOSE_CMD ?= docker-compose
 
 # Fabric versions used in the Makefile
-FABRIC_STABLE_VERSION           := 2.2.0
-FABRIC_STABLE_VERSION_MINOR     := 2.2
+FABRIC_STABLE_VERSION           := 2.4.3
+FABRIC_STABLE_VERSION_MINOR     := 2.4
 FABRIC_STABLE_VERSION_MAJOR     := 2
 
 FABRIC_PRERELEASE_VERSION       :=
@@ -114,7 +114,7 @@ CC_MODE_LSCC = lscc
 
 # Local variables used by makefile
 PROJECT_NAME           := fabric-sdk-go
-ARCH                   := $(shell uname -m)
+ARCH                   := amd64
 OS_NAME                := $(shell uname -s)
 FIXTURE_PROJECT_NAME   := fabsdkgo
 MAKEFILE_THIS          := $(lastword $(MAKEFILE_LIST))

pkg/client/channel/chclientrun_std.go

@@ -1,3 +1,4 @@
+//go:build !pprof
 // +build !pprof
 
 /*

pkg/client/event/event.go

@@ -33,12 +33,13 @@ type Client struct {
 	permitBlockEvents    bool
 	fromBlock            uint64
 	seekType             seek.Type
-	chaincodeId          string
+	chaincodeID          string
 	eventConsumerTimeout *time.Duration
 }
 
 // New returns a Client instance. Client receives events such as block, filtered block,
 // chaincode, and transaction status events.
+// nolint: gocyclo
 func New(channelProvider context.ChannelProvider, opts ...ClientOption) (*Client, error) {
 
 	channelContext, err := channelProvider()
@@ -69,8 +70,8 @@ func New(channelProvider context.ChannelProvider, opts ...ClientOption) (*Client
 				opts = append(opts, deliverclient.WithBlockNum(eventClient.fromBlock))
 			}
 		}
-		if eventClient.chaincodeId != "" {
-			opts = append(opts, deliverclient.WithChaincodeId(eventClient.chaincodeId))
+		if eventClient.chaincodeID != "" {
+			opts = append(opts, deliverclient.WithChaincodeID(eventClient.chaincodeID))
 		}
 		if eventClient.eventConsumerTimeout != nil {
 			opts = append(opts, dispatcher.WithEventConsumerTimeout(*eventClient.eventConsumerTimeout))

pkg/client/event/example_test.go

@@ -79,7 +79,7 @@ func ExampleClient_RegisterChaincodeEvent() {
 
 func ExampleClient_RegisterChaincodeEvent_NewService() {
 
-	ec, err := New(mockChannelProvider("mychannel"), WithChaincodeId("examplecc"))
+	ec, err := New(mockChannelProvider("mychannel"), WithChaincodeID("examplecc"))
 	if err != nil {
 		fmt.Println("failed to create client")
 	}

pkg/client/event/opts.go

@@ -42,11 +42,11 @@ func WithSeekType(seek seek.Type) ClientOption {
 	}
 }
 
-// WithChaincodeId indicates the target chaincode
+// WithChaincodeID indicates the target chaincode
 // Only deliverclient supports this
-func WithChaincodeId(id string) ClientOption {
+func WithChaincodeID(id string) ClientOption {
 	return func(c *Client) error {
-		c.chaincodeId = id
+		c.chaincodeID = id
 		return nil
 	}
 }

pkg/fab/events/deliverclient/opts.go

@@ -19,7 +19,7 @@ type params struct {
 	connProvider api.ConnectionProvider
 	seekType     seek.Type
 	fromBlock    uint64
-	chaincodeId  string
+	chaincodeID  string
 	respTimeout  time.Duration
 }
 
@@ -49,11 +49,11 @@ func WithBlockNum(value uint64) options.Opt {
 	}
 }
 
-// WithChaincodeId specifies the chaincode from which events are to be received.
-func WithChaincodeId(value string) options.Opt {
+// WithChaincodeID specifies the chaincode from which events are to be received.
+func WithChaincodeID(value string) options.Opt {
 	return func(p options.Params) {
-		if setter, ok := p.(chaincodeIdSetter); ok {
-			setter.SetChaincodeId(value)
+		if setter, ok := p.(chaincodeIDSetter); ok {
+			setter.SetChaincodeID(value)
 		}
 	}
 }
@@ -66,8 +66,8 @@ type fromBlockSetter interface {
 	SetFromBlock(value uint64)
 }
 
-type chaincodeIdSetter interface {
-	SetChaincodeId(value string)
+type chaincodeIDSetter interface {
+	SetChaincodeID(value string)
 }
 
 func (p *params) PermitBlockEvents() {
@@ -93,9 +93,9 @@ func (p *params) SetSeekType(value seek.Type) {
 	}
 }
 
-func (p *params) SetChaincodeId(value string) {
+func (p *params) SetChaincodeID(value string) {
 	logger.Debugf("ChaincodId: %d", value)
-	p.chaincodeId = value
+	p.chaincodeID = value
 }
 
 func (p *params) SetResponseTimeout(value time.Duration) {

pkg/fabsdk/fabsdk_std.go

@@ -1,3 +1,4 @@
+//go:build !pprof
 // +build !pprof
 
 /*

pkg/fabsdk/provider/chpvdr/cachekey.go

@@ -102,7 +102,7 @@ type params struct {
 	permitBlockEvents bool
 	seekType          seek.Type
 	fromBlock         uint64
-	chaincodeId       string
+	chaincodeID       string
 }
 
 func defaultParams() *params {
@@ -123,14 +123,14 @@ func (p *params) SetSeekType(value seek.Type) {
 	}
 }
 
-func (p *params) SetChaincodeId(value string) {
+func (p *params) SetChaincodeID(value string) {
 	if value != "" {
-		p.chaincodeId = value
+		p.chaincodeID = value
 	}
 }
 
 func (p *params) getOptKey() string {
 	//	Construct opts portion
-	optKey := fmt.Sprintf("blockEvents:%t,seekType:%s,fromBlock:%d,chaincodeId:%s", p.permitBlockEvents, p.seekType, p.fromBlock, p.chaincodeId)
+	optKey := fmt.Sprintf("blockEvents:%t,seekType:%s,fromBlock:%d,chaincodeId:%s", p.permitBlockEvents, p.seekType, p.fromBlock, p.chaincodeID)
 	return optKey
 }