Add chaincode ID to the cache key calculation

Author: jimthematrix

ci.properties

@@ -5,4 +5,4 @@
 #
 
 GO_MIN_VER=1.14.0
-GO_MAX_VER=1.16.99
+GO_MAX_VER=1.17.99

pkg/client/event/event.go

@@ -33,6 +33,7 @@ type Client struct {
 	permitBlockEvents    bool
 	fromBlock            uint64
 	seekType             seek.Type
+	chaincodeId          string
 	eventConsumerTimeout *time.Duration
 }
 
@@ -68,6 +69,9 @@ 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.eventConsumerTimeout != nil {
 			opts = append(opts, dispatcher.WithEventConsumerTimeout(*eventClient.eventConsumerTimeout))
 		}

pkg/client/event/example_test.go

@@ -77,6 +77,25 @@ func ExampleClient_RegisterChaincodeEvent() {
 
 }
 
+func ExampleClient_RegisterChaincodeEvent_NewService() {
+
+	ec, err := New(mockChannelProvider("mychannel"), WithChaincodeId("examplecc"))
+	if err != nil {
+		fmt.Println("failed to create client")
+	}
+
+	registration, _, err := ec.RegisterChaincodeEvent("examplecc", "event123")
+	if err != nil {
+		fmt.Println("failed to register chaincode event")
+	}
+	defer ec.Unregister(registration)
+
+	fmt.Println("chaincode event registered successfully")
+
+	// Output: chaincode event registered successfully
+
+}
+
 func ExampleClient_RegisterChaincodeEvent_withPayload() {
 
 	// If you require payload for chaincode events you have to use WithBlockEvents() option

pkg/client/event/opts.go

@@ -42,6 +42,15 @@ func WithSeekType(seek seek.Type) ClientOption {
 	}
 }
 
+// WithChaincodeId indicates the target chaincode
+// Only deliverclient supports this
+func WithChaincodeId(id string) ClientOption {
+	return func(c *Client) error {
+		c.chaincodeId = id
+		return nil
+	}
+}
+
 // WithEventConsumerTimeout is the timeout when sending events to a registered consumer.
 // If < 0, if buffer full, unblocks immediately and does not send.
 // If 0, if buffer full, will block and guarantee the event will be sent out.

pkg/fab/events/deliverclient/opts.go

@@ -19,6 +19,7 @@ type params struct {
 	connProvider api.ConnectionProvider
 	seekType     seek.Type
 	fromBlock    uint64
+	chaincodeId  string
 	respTimeout  time.Duration
 }
 
@@ -48,6 +49,15 @@ func WithBlockNum(value uint64) 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)
+		}
+	}
+}
+
 type seekTypeSetter interface {
 	SetSeekType(value seek.Type)
 }
@@ -56,6 +66,10 @@ type fromBlockSetter interface {
 	SetFromBlock(value uint64)
 }
 
+type chaincodeIdSetter interface {
+	SetChaincodeId(value string)
+}
+
 func (p *params) PermitBlockEvents() {
 	logger.Debug("PermitBlockEvents")
 	p.connProvider = deliverProvider
@@ -79,6 +93,11 @@ func (p *params) SetSeekType(value seek.Type) {
 	}
 }
 
+func (p *params) SetChaincodeId(value string) {
+	logger.Debugf("ChaincodId: %d", value)
+	p.chaincodeId = value
+}
+
 func (p *params) SetResponseTimeout(value time.Duration) {
 	logger.Debugf("ResponseTimeout: %s", value)
 	p.respTimeout = value

pkg/fabsdk/provider/chpvdr/cachekey.go

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