Merge branch 'main' into main

Author: andrew-coleman

pkg/fab/events/client/peerresolver/minblockheight/minblockheight_test.go

@@ -169,4 +169,19 @@ func TestOpts(t *testing.T) {
 		assert.Equal(t, 9, params.reconnectBlockHeightLagThreshold)
 	})
 
+	t.Run("No filter", func(t *testing.T) {
+		policy := fab.EventServicePolicy{
+			BlockHeightLagThreshold:    -1,
+			MinBlockHeightResolverMode: fab.ResolveByThreshold,
+		}
+		config.SetCustomChannelConfig(channelID, &fab.ChannelEndpointConfig{
+			Policies: fab.ChannelPolicies{
+				EventService: policy,
+			},
+		})
+
+		params := defaultParams(context, channelID)
+		require.NotNil(t, params)
+		assert.Equal(t, -1, params.blockHeightLagThreshold)
+	})
 }

pkg/fab/events/client/peerresolver/minblockheight/opts.go

@@ -104,10 +104,6 @@ func getBlockHeightLagThreshold(policy fab.EventServicePolicy) int {
 		threshold = 0
 	case fab.ResolveByThreshold:
 		threshold = policy.BlockHeightLagThreshold
-		if threshold <= 0 {
-			logger.Warnf("Invalid BlockHeightLagThreshold: %d. Using default: %d", threshold, defaultBlockHeightLagThreshold)
-			threshold = defaultBlockHeightLagThreshold
-		}
 	default:
 		logger.Warnf("Invalid MinBlockHeightResolverMode: [%s]. Using default: [%s]", policy.MinBlockHeightResolverMode, fab.ResolveByThreshold)
 		threshold = policy.BlockHeightLagThreshold