go/consensus/cometbft/api: Remove service descriptor interface

Author: peternose

go/consensus/cometbft/api/api.go

@@ -307,46 +307,23 @@ type ServiceEvent struct {
 }
 
 // ServiceDescriptor is a CometBFT consensus service descriptor.
-type ServiceDescriptor interface {
-	// Name returns the name of this service.
-	Name() string
-
-	// EventType returns the event type associated with the consensus service.
-	EventType() string
-
-	// Queries returns a channel that emits queries that need to be subscribed to.
-	Queries() <-chan cmtpubsub.Query
-}
-
-type serviceDescriptor struct {
+type ServiceDescriptor struct {
 	name      string
 	eventType string
 	queryCh   <-chan cmtpubsub.Query
 }
 
-func (sd *serviceDescriptor) Name() string {
-	return sd.name
-}
-
-func (sd *serviceDescriptor) EventType() string {
-	return sd.eventType
-}
-
-func (sd *serviceDescriptor) Queries() <-chan cmtpubsub.Query {
-	return sd.queryCh
-}
-
 // NewServiceDescriptor creates a new consensus service descriptor.
-func NewServiceDescriptor(name, eventType string, queryCh <-chan cmtpubsub.Query) ServiceDescriptor {
-	return &serviceDescriptor{
+func NewServiceDescriptor(name, eventType string, queryCh <-chan cmtpubsub.Query) *ServiceDescriptor {
+	return &ServiceDescriptor{
 		name:      name,
 		eventType: eventType,
 		queryCh:   queryCh,
 	}
 }
 
 // NewStaticServiceDescriptor creates a new static consensus service descriptor.
-func NewStaticServiceDescriptor(name, eventType string, queries []cmtpubsub.Query) ServiceDescriptor {
+func NewStaticServiceDescriptor(name, eventType string, queries []cmtpubsub.Query) *ServiceDescriptor {
 	ch := make(chan cmtpubsub.Query)
 	go func() {
 		for _, q := range queries {
@@ -356,10 +333,25 @@ func NewStaticServiceDescriptor(name, eventType string, queries []cmtpubsub.Quer
 	return NewServiceDescriptor(name, eventType, ch)
 }
 
+// Name returns the name of this service.
+func (sd *ServiceDescriptor) Name() string {
+	return sd.name
+}
+
+// EventType returns the event type associated with the consensus service.
+func (sd *ServiceDescriptor) EventType() string {
+	return sd.eventType
+}
+
+// Queries returns a channel that emits queries that need to be subscribed to.
+func (sd *ServiceDescriptor) Queries() <-chan cmtpubsub.Query {
+	return sd.queryCh
+}
+
 // ServiceClient is a consensus service client.
 type ServiceClient interface {
 	// ServiceDescriptor returns the consensus service descriptor.
-	ServiceDescriptor() ServiceDescriptor
+	ServiceDescriptor() *ServiceDescriptor
 
 	// DeliverHeight delivers a new block height.
 	DeliverHeight(ctx context.Context, height int64) error

go/consensus/cometbft/beacon/beacon.go

@@ -243,7 +243,7 @@ func (sc *ServiceClient) WatchLatestVRFEvent(context.Context) (<-chan *beaconAPI
 	return ch, sub, nil
 }
 
-func (sc *ServiceClient) ServiceDescriptor() tmapi.ServiceDescriptor {
+func (sc *ServiceClient) ServiceDescriptor() *tmapi.ServiceDescriptor {
 	return tmapi.NewStaticServiceDescriptor("beacon", app.EventType, []cmtpubsub.Query{app.QueryApp})
 }
 

go/consensus/cometbft/governance/governance.go

@@ -163,7 +163,7 @@ func (sc *ServiceClient) ConsensusParameters(ctx context.Context, height int64)
 }
 
 // ServiceDescriptor implements api.ServiceClient.
-func (sc *ServiceClient) ServiceDescriptor() tmapi.ServiceDescriptor {
+func (sc *ServiceClient) ServiceDescriptor() *tmapi.ServiceDescriptor {
 	return tmapi.NewStaticServiceDescriptor(api.ModuleName, app.EventType, []cmtpubsub.Query{app.QueryApp})
 }
 

go/consensus/cometbft/keymanager/keymanager.go

@@ -63,7 +63,7 @@ func (sc *ServiceClient) Churp() churpAPI.Backend {
 }
 
 // ServiceDescriptor implements api.ServiceClient.
-func (sc *ServiceClient) ServiceDescriptor() tmapi.ServiceDescriptor {
+func (sc *ServiceClient) ServiceDescriptor() *tmapi.ServiceDescriptor {
 	return tmapi.NewStaticServiceDescriptor(api.ModuleName, app.EventType, []cmtpubsub.Query{app.QueryApp})
 }
 

go/consensus/cometbft/registry/registry.go

@@ -238,7 +238,7 @@ func (sc *ServiceClient) ConsensusParameters(ctx context.Context, height int64)
 }
 
 // ServiceDescriptor implements api.ServiceClient.
-func (sc *ServiceClient) ServiceDescriptor() tmapi.ServiceDescriptor {
+func (sc *ServiceClient) ServiceDescriptor() *tmapi.ServiceDescriptor {
 	return tmapi.NewStaticServiceDescriptor(api.ModuleName, app.EventType, []cmtpubsub.Query{app.QueryApp})
 }
 

go/consensus/cometbft/roothash/roothash.go

@@ -329,7 +329,7 @@ func (sc *ServiceClient) getRuntimeNotifiers(id common.Namespace) *runtimeBroker
 }
 
 // ServiceDescriptor implements api.ServiceClient.
-func (sc *ServiceClient) ServiceDescriptor() tmapi.ServiceDescriptor {
+func (sc *ServiceClient) ServiceDescriptor() *tmapi.ServiceDescriptor {
 	return tmapi.NewServiceDescriptor(api.ModuleName, app.EventType, sc.queryCh)
 }
 

go/consensus/cometbft/scheduler/scheduler.go

@@ -115,7 +115,7 @@ func (sc *ServiceClient) getCurrentCommittees() ([]*api.Committee, error) {
 }
 
 // ServiceDescriptor implements api.ServiceClient.
-func (sc *ServiceClient) ServiceDescriptor() tmapi.ServiceDescriptor {
+func (sc *ServiceClient) ServiceDescriptor() *tmapi.ServiceDescriptor {
 	return tmapi.NewStaticServiceDescriptor(api.ModuleName, app.EventType, []cmtpubsub.Query{app.QueryApp})
 }
 

go/consensus/cometbft/staking/staking.go

@@ -310,7 +310,7 @@ func (sc *ServiceClient) ConsensusParameters(ctx context.Context, height int64)
 }
 
 // ServiceDescriptor implements api.ServiceClient.
-func (sc *ServiceClient) ServiceDescriptor() tmapi.ServiceDescriptor {
+func (sc *ServiceClient) ServiceDescriptor() *tmapi.ServiceDescriptor {
 	return tmapi.NewStaticServiceDescriptor(api.ModuleName, app.EventType, []cmtpubsub.Query{app.QueryApp})
 }
 

go/consensus/cometbft/vault/vault.go

@@ -153,7 +153,7 @@ func (sc *ServiceClient) ConsensusParameters(ctx context.Context, height int64)
 }
 
 // ServiceDescriptor implements api.ServiceClient.
-func (sc *ServiceClient) ServiceDescriptor() tmapi.ServiceDescriptor {
+func (sc *ServiceClient) ServiceDescriptor() *tmapi.ServiceDescriptor {
 	return tmapi.NewStaticServiceDescriptor(vault.ModuleName, app.EventType, []cmtpubsub.Query{app.QueryApp})
 }