simplify clients

Author: julienrbrt

.mockery.yaml

@@ -76,11 +76,6 @@ packages:
           dir: ./test/mocks
           pkgname: mocks
           filename: da.go
-      Verifier:
-        config:
-          dir: ./test/mocks
-          pkgname: mocks
-          filename: da.go
   github.com/evstack/ev-node/pkg/da/node:
     interfaces:
       BlobModule:

apps/evm/cmd/run.go

@@ -148,7 +148,7 @@ func createSequencer(
 	datastore datastore.Batching,
 	nodeConfig config.Config,
 	genesis genesis.Genesis,
-	daClient block.FullDAClient,
+	daClient block.DAClient,
 	executor execution.Executor,
 ) (coresequencer.Sequencer, error) {
 	if nodeConfig.Node.BasedSequencer {

block/internal/da/client.go

@@ -29,11 +29,11 @@ type client struct {
 	hasForcedNamespace bool
 }
 
-// Ensure client implements the FullClient interface.
-var _ FullClient = (*client)(nil)
+// Ensure client implements the Client interface.
+var _ Client = (*client)(nil)
 
 // NewClient creates a new unified DA client wrapper.
-func NewClient(cfg Config) FullClient {
+func NewClient(cfg Config) Client {
 	if cfg.Client == nil {
 		return nil
 	}

block/internal/da/interface.go

@@ -6,7 +6,8 @@ import (
 	datypes "github.com/evstack/ev-node/pkg/da/types"
 )
 
-// Client represents the DA client contract.
+// Client defines the complete interface for DA layer operations.
+// This is the interface implemented by the concrete DA client.
 type Client interface {
 	// Submit submits blobs to the DA layer.
 	Submit(ctx context.Context, data [][]byte, gasPrice float64, namespace []byte, options []byte) datypes.ResultSubmit
@@ -25,21 +26,10 @@ type Client interface {
 	GetDataNamespace() []byte
 	GetForcedInclusionNamespace() []byte
 	HasForcedInclusionNamespace() bool
-}
 
-// Verifier defines the interface for DA proof verification operations.
-// This is a subset of the DA interface used by sequencers to verify batch inclusion.
-type Verifier interface {
 	// GetProofs returns inclusion Proofs for Blobs specified by their IDs.
 	GetProofs(ctx context.Context, ids []datypes.ID, namespace []byte) ([]datypes.Proof, error)
 
 	// Validate validates Commitments against the corresponding Proofs.
 	Validate(ctx context.Context, ids []datypes.ID, proofs []datypes.Proof, namespace []byte) ([]bool, error)
 }
-
-// FullClient combines Client and Verifier interfaces.
-// This is the complete interface implemented by the concrete DA client.
-type FullClient interface {
-	Client
-	Verifier
-}

block/internal/da/tracing.go

@@ -12,14 +12,14 @@ import (
 	datypes "github.com/evstack/ev-node/pkg/da/types"
 )
 
-// tracedClient decorates a FullClient with OpenTelemetry spans.
+// tracedClient decorates a Client with OpenTelemetry spans.
 type tracedClient struct {
-	inner  FullClient
+	inner  Client
 	tracer trace.Tracer
 }
 
 // WithTracingClient decorates the provided client with tracing spans.
-func WithTracingClient(inner FullClient) FullClient {
+func WithTracingClient(inner Client) Client {
 	return &tracedClient{inner: inner, tracer: otel.Tracer("ev-node/da")}
 }
 

block/internal/da/tracing_test.go

@@ -63,7 +63,7 @@ func (m *mockFullClient) GetForcedInclusionNamespace() []byte { return []byte{0x
 func (m *mockFullClient) HasForcedInclusionNamespace() bool   { return true }
 
 // setup a tracer provider + span recorder
-func setupDATrace(t *testing.T, inner FullClient) (FullClient, *tracetest.SpanRecorder) {
+func setupDATrace(t *testing.T, inner Client) (Client, *tracetest.SpanRecorder) {
 	t.Helper()
 	sr := tracetest.NewSpanRecorder()
 	tp := sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(sr))

block/public.go

@@ -35,20 +35,12 @@ func NopMetrics() *Metrics {
 // DAClient is the interface representing the DA client for public use.
 type DAClient = da.Client
 
-// DAVerifier is the interface for DA proof verification operations.
-type DAVerifier = da.Verifier
-
-// FullDAClient combines DAClient and DAVerifier interfaces.
-// This is the complete interface implemented by the concrete DA client.
-type FullDAClient = da.FullClient
-
 // NewDAClient creates a new DA client backed by the provided BlobClient implementation.
-// The returned client implements both DAClient and DAVerifier interfaces.
 func NewDAClient(
 	client datypes.BlobClient,
 	config config.Config,
 	logger zerolog.Logger,
-) FullDAClient {
+) DAClient {
 	base := da.NewClient(da.Config{
 		Client:                   client,
 		Logger:                   logger,

pkg/sequencers/based/sequencer.go

@@ -41,7 +41,7 @@ type BasedSequencer struct {
 
 // NewBasedSequencer creates a new based sequencer instance
 func NewBasedSequencer(
-	daClient block.FullDAClient,
+	daClient block.DAClient,
 	cfg config.Config,
 	db ds.Batching,
 	genesis genesis.Genesis,

pkg/sequencers/based/sequencer_test.go

@@ -22,10 +22,9 @@ import (
 	"github.com/evstack/ev-node/test/mocks"
 )
 
-// MockFullDAClient combines MockClient and MockVerifier to implement FullDAClient
-type MockFullDAClient struct {
+// MockDAClient wraps MockClient for the consolidated Client interface
+type MockDAClient struct {
 	*mocks.MockClient
-	*mocks.MockVerifier
 }
 
 // createDefaultMockExecutor creates a MockExecutor with default passthrough behavior for FilterTxs and GetExecutionInfo
@@ -64,9 +63,8 @@ func createTestSequencer(t *testing.T, mockRetriever *common.MockForcedInclusion
 	db := syncds.MutexWrap(ds.NewMapDatastore())
 
 	// Create mock DA client
-	mockDAClient := &MockFullDAClient{
+	mockDAClient := &MockDAClient{
 		MockClient:   mocks.NewMockClient(t),
-		MockVerifier: mocks.NewMockVerifier(t),
 	}
 	// Mock the forced inclusion namespace call
 	mockDAClient.MockClient.On("GetForcedInclusionNamespace").Return([]byte("test-forced-inclusion-ns")).Maybe()
@@ -462,9 +460,8 @@ func TestBasedSequencer_CheckpointPersistence(t *testing.T) {
 	db := syncds.MutexWrap(ds.NewMapDatastore())
 
 	// Create mock DA client
-	mockDAClient := &MockFullDAClient{
+	mockDAClient := &MockDAClient{
 		MockClient:   mocks.NewMockClient(t),
-		MockVerifier: mocks.NewMockVerifier(t),
 	}
 	mockDAClient.MockClient.On("GetForcedInclusionNamespace").Return([]byte("test-forced-inclusion-ns")).Maybe()
 	mockDAClient.MockClient.On("HasForcedInclusionNamespace").Return(true).Maybe()
@@ -489,9 +486,8 @@ func TestBasedSequencer_CheckpointPersistence(t *testing.T) {
 	assert.Equal(t, 2, len(resp.Batch.Transactions))
 
 	// Create a new sequencer with the same datastore (simulating restart)
-	mockDAClient2 := &MockFullDAClient{
+	mockDAClient2 := &MockDAClient{
 		MockClient:   mocks.NewMockClient(t),
-		MockVerifier: mocks.NewMockVerifier(t),
 	}
 	mockDAClient2.MockClient.On("GetForcedInclusionNamespace").Return([]byte("test-forced-inclusion-ns")).Maybe()
 	mockDAClient2.MockClient.On("HasForcedInclusionNamespace").Return(true).Maybe()
@@ -534,9 +530,8 @@ func TestBasedSequencer_CrashRecoveryMidEpoch(t *testing.T) {
 	db := syncds.MutexWrap(ds.NewMapDatastore())
 
 	// Create mock DA client
-	mockDAClient := &MockFullDAClient{
+	mockDAClient := &MockDAClient{
 		MockClient:   mocks.NewMockClient(t),
-		MockVerifier: mocks.NewMockVerifier(t),
 	} // On restart, the epoch is re-fetched but we must NOT reset TxIndex
 
 	mockDAClient.MockClient.On("GetForcedInclusionNamespace").Return([]byte("test-forced-inclusion-ns")).Maybe()
@@ -595,9 +590,8 @@ func TestBasedSequencer_CrashRecoveryMidEpoch(t *testing.T) {
 	// === SIMULATE CRASH: Create new sequencer with same DB ===
 	// The in-memory cache is lost, but checkpoint is persisted
 
-	mockDAClient2 := &MockFullDAClient{
+	mockDAClient2 := &MockDAClient{
 		MockClient:   mocks.NewMockClient(t),
-		MockVerifier: mocks.NewMockVerifier(t),
 	}
 	mockDAClient2.MockClient.On("GetForcedInclusionNamespace").Return([]byte("test-forced-inclusion-ns")).Maybe()
 	mockDAClient2.MockClient.On("HasForcedInclusionNamespace").Return(true).Maybe()
@@ -917,9 +911,8 @@ func TestBasedSequencer_GetNextBatch_GasFilteringPreservesUnprocessedTxs(t *test
 
 	// Create sequencer with custom executor
 	db := syncds.MutexWrap(ds.NewMapDatastore())
-	mockDAClient := &MockFullDAClient{
+	mockDAClient := &MockDAClient{
 		MockClient:   mocks.NewMockClient(t),
-		MockVerifier: mocks.NewMockVerifier(t),
 	}
 	mockDAClient.MockClient.On("GetForcedInclusionNamespace").Return([]byte("test-forced-inclusion-ns")).Maybe()
 	mockDAClient.MockClient.On("HasForcedInclusionNamespace").Return(true).Maybe()

pkg/sequencers/single/sequencer.go

@@ -36,7 +36,7 @@ type Sequencer struct {
 	cfg     config.Config
 
 	Id       []byte
-	daClient block.FullDAClient
+	daClient block.DAClient
 
 	batchTime time.Duration
 	queue     *BatchQueue // single queue for immediate availability
@@ -57,7 +57,7 @@ type Sequencer struct {
 func NewSequencer(
 	logger zerolog.Logger,
 	db ds.Batching,
-	daClient block.FullDAClient,
+	daClient block.DAClient,
 	cfg config.Config,
 	id []byte,
 	maxQueueSize int,