[Access] Add arguments getter for data providers

engine/access/rest/websockets/controller.go

@@ -443,8 +443,9 @@ func (c *Controller) handleListSubscriptions(ctx context.Context, msg models.Lis
 	var subs []*models.SubscriptionEntry
 	err := c.dataProviders.ForEach(func(id uuid.UUID, provider dp.DataProvider) error {
 		subs = append(subs, &models.SubscriptionEntry{
-			ID:    id.String(),
-			Topic: provider.Topic(),
+			ID:        id.String(),
+			Topic:     provider.Topic(),
+			Arguments: provider.Arguments(),
 		})
 		return nil
 	})

engine/access/rest/websockets/controller_test.go

@@ -483,8 +483,10 @@ func (s *WsControllerSuite) TestListSubscriptions() {
 
 		id := uuid.New()
 		topic := dp.BlocksTopic
+		arguments := models.Arguments{}
 		dataProvider.On("ID").Return(id)
 		dataProvider.On("Topic").Return(topic)
+		dataProvider.On("Arguments").Return(arguments)
 		// data provider might finish on its own or controller will close it via Close()
 		dataProvider.On("Close").Return(nil).Maybe()
 		dataProvider.
@@ -530,6 +532,7 @@ func (s *WsControllerSuite) TestListSubscriptions() {
 				require.Equal(t, 1, len(response.Subscriptions))
 				require.Equal(t, id.String(), response.Subscriptions[0].ID)
 				require.Equal(t, topic, response.Subscriptions[0].Topic)
+				require.Equal(t, arguments, response.Subscriptions[0].Arguments)
 
 				return websocket.ErrCloseSent
 			}).

engine/access/rest/websockets/data_providers/account_statuses_provider.go

@@ -64,6 +64,7 @@ func NewAccountStatusesDataProvider(
 
 	p.baseDataProvider = newBaseDataProvider(
 		topic,
+		arguments,
 		cancel,
 		send,
 		p.createSubscription(subCtx, accountStatusesArgs), // Set up a subscription to account statuses based on arguments.

engine/access/rest/websockets/data_providers/base_provider.go

@@ -5,13 +5,15 @@ import (
 
 	"github.com/google/uuid"
 
+	"github.com/onflow/flow-go/engine/access/rest/websockets/models"
 	"github.com/onflow/flow-go/engine/access/subscription"
 )
 
 // baseDataProvider holds common objects for the provider
 type baseDataProvider struct {
 	id           uuid.UUID
 	topic        string
+	arguments    models.Arguments
 	cancel       context.CancelFunc
 	send         chan<- interface{}
 	subscription subscription.Subscription
@@ -20,13 +22,15 @@ type baseDataProvider struct {
 // newBaseDataProvider creates a new instance of baseDataProvider.
 func newBaseDataProvider(
 	topic string,
+	arguments models.Arguments,
 	cancel context.CancelFunc,
 	send chan<- interface{},
 	subscription subscription.Subscription,
 ) *baseDataProvider {
 	return &baseDataProvider{
 		id:           uuid.New(),
 		topic:        topic,
+		arguments:    arguments,
 		cancel:       cancel,
 		send:         send,
 		subscription: subscription,
@@ -43,6 +47,11 @@ func (b *baseDataProvider) Topic() string {
 	return b.topic
 }
 
+// Arguments returns the arguments associated with the data provider.
+func (b *baseDataProvider) Arguments() models.Arguments {
+	return b.arguments
+}
+
 // Close terminates the data provider.
 //
 // No errors are expected during normal operations.

engine/access/rest/websockets/data_providers/block_digests_provider.go

@@ -46,6 +46,7 @@ func NewBlockDigestsDataProvider(
 	subCtx, cancel := context.WithCancel(ctx)
 	p.baseDataProvider = newBaseDataProvider(
 		topic,
+		arguments,
 		cancel,
 		send,
 		p.createSubscription(subCtx, blockArgs), // Set up a subscription to block digests based on arguments.

engine/access/rest/websockets/data_providers/block_headers_provider.go

@@ -47,6 +47,7 @@ func NewBlockHeadersDataProvider(
 	subCtx, cancel := context.WithCancel(ctx)
 	p.baseDataProvider = newBaseDataProvider(
 		topic,
+		arguments,
 		cancel,
 		send,
 		p.createSubscription(subCtx, blockArgs), // Set up a subscription to block headers based on arguments.

engine/access/rest/websockets/data_providers/blocks_provider.go

@@ -61,6 +61,7 @@ func NewBlocksDataProvider(
 	subCtx, cancel := context.WithCancel(ctx)
 	p.baseDataProvider = newBaseDataProvider(
 		topic,
+		arguments,
 		cancel,
 		send,
 		p.createSubscription(subCtx, p.arguments), // Set up a subscription to blocks based on arguments.

engine/access/rest/websockets/data_providers/data_provider.go

@@ -2,15 +2,19 @@ package data_providers
 
 import (
 	"github.com/google/uuid"
+
+	"github.com/onflow/flow-go/engine/access/rest/websockets/models"
 )
 
 // The DataProvider is the interface abstracts of the actual data provider used by the WebSocketCollector.
-// It provides methods for retrieving the provider's unique ID, topic, and a methods to close and run the provider.
+// It provides methods for retrieving the provider's unique ID, topic, arguments and a methods to close and run the provider.
 type DataProvider interface {
 	// ID returns the unique identifier of the data provider.
 	ID() uuid.UUID
 	// Topic returns the topic associated with the data provider.
 	Topic() string
+	// Arguments returns the arguments associated with the data provider.
+	Arguments() models.Arguments
 	// Close terminates the data provider.
 	//
 	// No errors are expected during normal operations.

engine/access/rest/websockets/data_providers/events_provider.go

@@ -63,6 +63,7 @@ func NewEventsDataProvider(
 
 	p.baseDataProvider = newBaseDataProvider(
 		topic,
+		arguments,
 		cancel,
 		send,
 		p.createSubscription(subCtx, eventArgs), // Set up a subscription to events based on arguments.
@@ -103,7 +104,6 @@ func (p *EventsDataProvider) handleResponse() func(eventsResponse *backend.Event
 
 		var response models.EventResponse
 		response.Build(eventsResponse, index)
-
 		p.send <- &response
 
 		return nil

engine/access/rest/websockets/data_providers/factory_test.go

@@ -164,6 +164,7 @@ func (s *DataProviderFactorySuite) TestSupportedTopics() {
 			s.Require().NotNil(provider, "Expected provider for topic %s", test.topic)
 			s.Require().NoError(err, "Expected no error for topic %s", test.topic)
 			s.Require().Equal(test.topic, provider.Topic())
+			s.Require().Equal(test.arguments, provider.Arguments())
 
 			test.assertExpectations()
 		})

engine/access/rest/websockets/data_providers/send_and_get_transaction_statuses_provider.go

@@ -60,6 +60,7 @@ func NewSendAndGetTransactionStatusesDataProvider(
 
 	p.baseDataProvider = newBaseDataProvider(
 		topic,
+		arguments,
 		cancel,
 		send,
 		p.createSubscription(subCtx, sendTxStatusesArgs), // Set up a subscription to tx statuses based on arguments.

engine/access/rest/websockets/data_providers/transaction_statuses_provider.go

@@ -63,6 +63,7 @@ func NewTransactionStatusesDataProvider(
 
 	p.baseDataProvider = newBaseDataProvider(
 		topic,
+		arguments,
 		cancel,
 		send,
 		p.createSubscription(subCtx, txStatusesArgs), // Set up a subscription to tx statuses based on arguments.

engine/access/rest/websockets/models/subscription_entry.go

@@ -2,6 +2,7 @@ package models
 
 // SubscriptionEntry represents an active subscription entry.
 type SubscriptionEntry struct {
-	Topic string `json:"topic,omitempty"` // Topic of the subscription
-	ID    string `json:"id,omitempty"`    // Unique subscription ID
+	Topic     string    `json:"topic,omitempty"` // Topic of the subscription
+	ID        string    `json:"id,omitempty"`    // Unique subscription ID
+	Arguments Arguments `json:"arguments"`       // Arguments of the subscription
 }