Merge branch 'main' into 1.4.0-rc.1-manifest

EnriqueL8 · web-flow · commit 134dc1444c10 · 2025-07-08T11:51:31.000+01:00
diff --git a/internal/events/event_manager.go b/internal/events/event_manager.go
@@ -311,8 +311,6 @@ func (em *eventManager) QueueBatchRewind(batchID *fftypes.UUID) {
 }
 
 func (em *eventManager) FilterHistoricalEventsOnSubscription(ctx context.Context, events []*core.EnrichedEvent, sub *core.Subscription) ([]*core.EnrichedEvent, error) {
-	// Transport must be provided for validation, but we're not using it for event delivery so fake the transport
-	sub.Transport = "websockets"
 	subscriptionDef, err := em.subManager.parseSubscriptionDef(ctx, sub)
 	if err != nil {
 		return nil, err
diff --git a/internal/events/event_manager_test.go b/internal/events/event_manager_test.go
@@ -664,6 +664,7 @@ func TestEventFilterOnSubscriptionMatchesEventType(t *testing.T) {
 	}
 
 	subscription := &core.Subscription{
+		Transport: "websockets",
 		Filter: core.SubscriptionFilter{
 			Events: core.EventTypeIdentityConfirmed.String(),
 		},

Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,6 @@ func (em eventManager) QueueBatchRewind(batchID fftypes.UUID) {`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`func (em eventManager) FilterHistoricalEventsOnSubscription(ctx context.Context, events []core.EnrichedEvent, sub core.Subscription) ([]core.EnrichedEvent, error) {`
`314`		`- // Transport must be provided for validation, but we're not using it for event delivery so fake the transport`
`315`		`- sub.Transport = "websockets"`
`316`	`314`	`subscriptionDef, err := em.subManager.parseSubscriptionDef(ctx, sub)`
`317`	`315`	`if err != nil {`
`318`	`316`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -664,6 +664,7 @@ func TestEventFilterOnSubscriptionMatchesEventType(t *testing.T) {`
`664`	`664`	`}`
`665`	`665`
`666`	`666`	`subscription := &core.Subscription{`
	`667`	`+ Transport: "websockets",`
`667`	`668`	`Filter: core.SubscriptionFilter{`
`668`	`669`	`Events: core.EventTypeIdentityConfirmed.String(),`
`669`	`670`	`},`