chore: simplified naming

Author: chatton

block/internal/da/forced_inclusion_retriever.go

@@ -16,8 +16,14 @@ import (
 // ErrForceInclusionNotConfigured is returned when the forced inclusion namespace is not configured.
 var ErrForceInclusionNotConfigured = errors.New("forced inclusion namespace not configured")
 
-// ForcedInclusionRetriever handles retrieval of forced inclusion transactions from DA.
-type ForcedInclusionRetriever struct {
+// ForcedInclusionRetriever defines the interface for retrieving forced inclusion transactions from DA.
+type ForcedInclusionRetriever interface {
+	RetrieveForcedIncludedTxs(ctx context.Context, daHeight uint64) (*ForcedInclusionEvent, error)
+	Stop()
+}
+
+// forcedInclusionRetriever handles retrieval of forced inclusion transactions from DA.
+type forcedInclusionRetriever struct {
 	client        Client
 	logger        zerolog.Logger
 	daEpochSize   uint64
@@ -40,7 +46,7 @@ func NewForcedInclusionRetriever(
 	logger zerolog.Logger,
 	cfg config.Config,
 	daStartHeight, daEpochSize uint64,
-) ForcedInclusionRetrieverAPI {
+) ForcedInclusionRetriever {
 	retrieverLogger := logger.With().Str("component", "forced_inclusion_retriever").Logger()
 
 	// Create async block retriever for background prefetching
@@ -54,7 +60,7 @@ func NewForcedInclusionRetriever(
 	)
 	asyncFetcher.Start()
 
-	base := &ForcedInclusionRetriever{
+	base := &forcedInclusionRetriever{
 		client:        client,
 		logger:        retrieverLogger,
 		daStartHeight: daStartHeight,
@@ -68,14 +74,14 @@ func NewForcedInclusionRetriever(
 }
 
 // Stop stops the background prefetcher.
-func (r *ForcedInclusionRetriever) Stop() {
+func (r *forcedInclusionRetriever) Stop() {
 	r.asyncFetcher.Stop()
 }
 
 // RetrieveForcedIncludedTxs retrieves forced inclusion transactions at the given DA height.
 // It respects epoch boundaries and only fetches at epoch end.
 // It tries to get blocks from the async fetcher cache first, then falls back to sync fetching.
-func (r *ForcedInclusionRetriever) RetrieveForcedIncludedTxs(ctx context.Context, daHeight uint64) (*ForcedInclusionEvent, error) {
+func (r *forcedInclusionRetriever) RetrieveForcedIncludedTxs(ctx context.Context, daHeight uint64) (*ForcedInclusionEvent, error) {
 	// when daStartHeight is not set or no namespace is configured, we retrieve nothing.
 	if !r.client.HasForcedInclusionNamespace() {
 		return nil, ErrForceInclusionNotConfigured

block/internal/da/forced_inclusion_tracing.go

@@ -9,20 +9,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-// ForcedInclusionRetrieverAPI defines the interface for retrieving forced inclusion transactions from DA.
-type ForcedInclusionRetrieverAPI interface {
-	RetrieveForcedIncludedTxs(ctx context.Context, daHeight uint64) (*ForcedInclusionEvent, error)
-	Stop()
-}
-
-var _ ForcedInclusionRetrieverAPI = (*tracedForcedInclusionRetriever)(nil)
+var _ ForcedInclusionRetriever = (*tracedForcedInclusionRetriever)(nil)
 
 type tracedForcedInclusionRetriever struct {
-	inner  ForcedInclusionRetrieverAPI
+	inner  ForcedInclusionRetriever
 	tracer trace.Tracer
 }
 
-func withTracingForcedInclusionRetriever(inner ForcedInclusionRetrieverAPI) ForcedInclusionRetrieverAPI {
+func withTracingForcedInclusionRetriever(inner ForcedInclusionRetriever) ForcedInclusionRetriever {
 	return &tracedForcedInclusionRetriever{
 		inner:  inner,
 		tracer: otel.Tracer("ev-node/forced-inclusion"),

block/internal/syncing/syncer.go

@@ -104,7 +104,7 @@ type Syncer struct {
 
 	// Handlers
 	daRetriever DARetriever
-	fiRetriever da.ForcedInclusionRetrieverAPI
+	fiRetriever da.ForcedInclusionRetriever
 	p2pHandler  p2pHandler
 
 	// Forced inclusion tracking