rename for clarity

Author: randygrok

block/internal/da/celestia_client.go block/internal/da/blob_client.goblock/internal/da/celestia_client.go renamed to block/internal/da/blob_client.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/celestiaorg/go-square/v3/share"
+	"github.com/evstack/ev-node/da/newjsonrpc"
 	"github.com/rs/zerolog"
 
-	celestia "github.com/evstack/ev-node/da/celestia"
 	"github.com/evstack/ev-node/pkg/blob"
 )
 
@@ -28,7 +28,7 @@ var (
 
 // CelestiaBlobConfig contains configuration for the Celestia blob client.
 type CelestiaBlobConfig struct {
-	Celestia       *celestia.Client
+	Celestia       *newjsonrpc.Client
 	Logger         zerolog.Logger
 	DefaultTimeout time.Duration
 	Namespace      string
@@ -38,7 +38,7 @@ type CelestiaBlobConfig struct {
 
 // CelestiaBlobClient wraps the blob RPC with namespace handling and error mapping.
 type CelestiaBlobClient struct {
-	blobAPI         *celestia.BlobAPI
+	blobAPI         *newjsonrpc.BlobAPI
 	logger          zerolog.Logger
 	defaultTimeout  time.Duration
 	namespaceBz     []byte

block/internal/da/celestia_client_test.go block/internal/da/blob_client_test.goblock/internal/da/celestia_client_test.go renamed to block/internal/da/blob_client_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 
 	"github.com/celestiaorg/go-square/v3/share"
+	"github.com/evstack/ev-node/da/newjsonrpc"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	celestia "github.com/evstack/ev-node/da/celestia"
 	"github.com/evstack/ev-node/pkg/blob"
 )
 
@@ -21,7 +21,7 @@ type mockCelestiaBlobAPI struct {
 	blobs       []*blob.Blob
 	proof       *blob.Proof
 	included    bool
-	commitProof *celestia.CommitmentProof
+	commitProof *newjsonrpc.CommitmentProof
 }
 
 func (m *mockCelestiaBlobAPI) Submit(ctx context.Context, blobs []*blob.Blob, opts *blob.SubmitOptions) (uint64, error) {
@@ -40,25 +40,25 @@ func (m *mockCelestiaBlobAPI) Included(ctx context.Context, height uint64, names
 	return m.included, m.submitErr
 }
 
-func (m *mockCelestiaBlobAPI) GetCommitmentProof(ctx context.Context, height uint64, namespace share.Namespace, shareCommitment []byte) (*celestia.CommitmentProof, error) {
+func (m *mockCelestiaBlobAPI) GetCommitmentProof(ctx context.Context, height uint64, namespace share.Namespace, shareCommitment []byte) (*newjsonrpc.CommitmentProof, error) {
 	return m.commitProof, m.submitErr
 }
 
-func (m *mockCelestiaBlobAPI) Subscribe(ctx context.Context, namespace share.Namespace) (<-chan *celestia.SubscriptionResponse, error) {
-	ch := make(chan *celestia.SubscriptionResponse)
+func (m *mockCelestiaBlobAPI) Subscribe(ctx context.Context, namespace share.Namespace) (<-chan *newjsonrpc.SubscriptionResponse, error) {
+	ch := make(chan *newjsonrpc.SubscriptionResponse)
 	close(ch)
 	return ch, nil
 }
 
-func makeCelestiaClient(m *mockCelestiaBlobAPI) *celestia.Client {
-	var api celestia.BlobAPI
+func makeCelestiaClient(m *mockCelestiaBlobAPI) *newjsonrpc.Client {
+	var api newjsonrpc.BlobAPI
 	api.Internal.Submit = m.Submit
 	api.Internal.GetAll = m.GetAll
 	api.Internal.GetProof = m.GetProof
 	api.Internal.Included = m.Included
 	api.Internal.GetCommitmentProof = m.GetCommitmentProof
 	api.Internal.Subscribe = m.Subscribe
-	return &celestia.Client{Blob: api}
+	return &newjsonrpc.Client{Blob: api}
 }
 
 func TestCelestiaClient_Submit_ErrorMapping(t *testing.T) {

da/celestia/blob.go da/newjsonrpc/blob.goda/celestia/blob.go renamed to da/newjsonrpc/blob.go

@@ -1,4 +1,4 @@
-package celestia
+package newjsonrpc
 
 import (
 	"context"

da/celestia/blob_test.go da/newjsonrpc/blob_test.goda/celestia/blob_test.go renamed to da/newjsonrpc/blob_test.go

@@ -1,4 +1,4 @@
-package celestia
+package newjsonrpc
 
 import (
 	"context"

da/celestia/client.go da/newjsonrpc/client.goda/celestia/client.go renamed to da/newjsonrpc/client.go

@@ -1,4 +1,4 @@
-package celestia
+package newjsonrpc
 
 import (
 	"context"

da/celestia/types.go da/newjsonrpc/types.goda/celestia/types.go renamed to da/newjsonrpc/types.go

@@ -1,4 +1,4 @@
-package celestia
+package newjsonrpc
 
 import "github.com/evstack/ev-node/pkg/blob"
 

test/e2e/integration/celestia_client_integration_test.go

@@ -24,10 +24,10 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	govmodule "github.com/cosmos/cosmos-sdk/x/gov"
 	"github.com/cosmos/ibc-go/v8/modules/apps/transfer"
+	"github.com/evstack/ev-node/da/newjsonrpc"
 	"github.com/stretchr/testify/require"
 
 	sdkmath "cosmossdk.io/math"
-	"github.com/evstack/ev-node/da/celestia"
 	"github.com/evstack/ev-node/pkg/blob"
 )
 
@@ -207,7 +207,7 @@ func TestClient_SubmitAndGetBlobAgainstRealNode(t *testing.T) {
 	})
 	require.NoError(t, err, "bridge RPC reachable")
 
-	client, err := celestia.NewClient(ctx, rpcAddr, "", "")
+	client, err := newjsonrpc.NewClient(ctx, rpcAddr, "", "")
 	require.NoError(t, err, "new da client")
 	t.Cleanup(client.Close)