reduce diff

Author: julienrbrt

execution/grpc/client.go

@@ -15,8 +15,8 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/evstack/ev-node/core/execution"
-	pb "github.com/evstack/ev-node/execution/grpc/types/pb"
-	"github.com/evstack/ev-node/execution/grpc/types/pb/pbconnect"
+	pb "github.com/evstack/ev-node/execution/grpc/types/pb/evnode/v1"
+	"github.com/evstack/ev-node/execution/grpc/types/pb/evnode/v1/v1connect"
 )
 
 // Ensure Client implements the execution.Executor interface
@@ -25,7 +25,7 @@ var _ execution.Executor = (*Client)(nil)
 // Client is a gRPC client that implements the execution.Executor interface.
 // It communicates with a remote execution service via gRPC using Connect-RPC.
 type Client struct {
-	client pbconnect.ExecutorServiceClient
+	client v1connect.ExecutorServiceClient
 }
 
 const (
@@ -99,7 +99,7 @@ func NewClient(url string, opts ...connect.ClientOption) (*Client, error) {
 		return nil, err
 	}
 	return &Client{
-		client: pbconnect.NewExecutorServiceClient(
+		client: v1connect.NewExecutorServiceClient(
 			httpClient,
 			targetURL,
 			opts...,

execution/grpc/handler.go

@@ -10,7 +10,7 @@ import (
 	"golang.org/x/net/http2/h2c"
 
 	"github.com/evstack/ev-node/core/execution"
-	"github.com/evstack/ev-node/execution/grpc/types/pb/pbconnect"
+	"github.com/evstack/ev-node/execution/grpc/types/pb/evnode/v1/v1connect"
 )
 
 // NewExecutorServiceHandler creates a new HTTP handler for the ExecutorService.
@@ -33,13 +33,13 @@ func NewExecutorServiceHandler(executor execution.Executor, opts ...connect.Hand
 
 	// Set up gRPC reflection for debugging and discovery
 	reflector := grpcreflect.NewStaticReflector(
-		pbconnect.ExecutorServiceName,
+		v1connect.ExecutorServiceName,
 	)
 	mux.Handle(grpcreflect.NewHandlerV1(reflector, compress1KB))
 	mux.Handle(grpcreflect.NewHandlerV1Alpha(reflector, compress1KB))
 
 	// Register the ExecutorService
-	path, handler := pbconnect.NewExecutorServiceHandler(server, append(opts, compress1KB)...)
+	path, handler := v1connect.NewExecutorServiceHandler(server, append(opts, compress1KB)...)
 	mux.Handle(path, handler)
 
 	// Use h2c to support HTTP/2 without TLS

execution/grpc/proto/execution.proto …ion/grpc/proto/evnode/v1/execution.protoexecution/grpc/proto/execution.proto renamed to execution/grpc/proto/evnode/v1/execution.proto execution/grpc/proto/execution.proto renamed to execution/grpc/proto/evnode/v1/execution.proto

@@ -3,7 +3,7 @@ package evnode.v1;
 
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/evstack/ev-node/execution/grpc/types/pb";
+option go_package = "github.com/evstack/ev-node/execution/grpc/types/pb/evnode/v1";
 
 // ExecutorService defines the execution layer interface for execution/grpc
 service ExecutorService {

execution/grpc/server.go

@@ -8,7 +8,7 @@ import (
 	"connectrpc.com/connect"
 
 	"github.com/evstack/ev-node/core/execution"
-	pb "github.com/evstack/ev-node/execution/grpc/types/pb"
+	pb "github.com/evstack/ev-node/execution/grpc/types/pb/evnode/v1"
 )
 
 // Server is a gRPC server that wraps an execution.Executor implementation.

execution/grpc/server_test.go

@@ -10,7 +10,7 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/evstack/ev-node/core/execution"
-	pb "github.com/evstack/ev-node/execution/grpc/types/pb"
+	pb "github.com/evstack/ev-node/execution/grpc/types/pb/evnode/v1"
 )
 
 func TestServer_InitChain(t *testing.T) {

execution/grpc/tx_batch.go

@@ -3,7 +3,7 @@ package grpc
 import (
 	"fmt"
 
-	pb "github.com/evstack/ev-node/execution/grpc/types/pb"
+	pb "github.com/evstack/ev-node/execution/grpc/types/pb/evnode/v1"
 )
 
 // maxTxBatchTxSize is the largest transaction length representable in TxBatch.TxSizes:

execution/grpc/tx_batch_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	pb "github.com/evstack/ev-node/execution/grpc/types/pb"
+	pb "github.com/evstack/ev-node/execution/grpc/types/pb/evnode/v1"
 )
 
 func mustEncodeTxBatch(t *testing.T, txs [][]byte) *pb.TxBatch {