Skip to content

Commit fa2d3dd

Browse files
committed
feat: move namespace to pkg da types
1 parent 34aedd2 commit fa2d3dd

4 files changed

Lines changed: 8 additions & 10 deletions

File tree

block/internal/da/client.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
coreda "github.com/evstack/ev-node/core/da"
1515
"github.com/evstack/ev-node/pkg/blob"
1616
datypes "github.com/evstack/ev-node/pkg/da/types"
17-
"github.com/evstack/ev-node/pkg/namespace"
1817
)
1918

2019
// Client is the interface representing the DA client.
@@ -72,16 +71,16 @@ func NewClient(cfg Config) *client {
7271
hasForcedInclusionNs := cfg.ForcedInclusionNamespace != ""
7372
var namespaceForcedInclusionBz []byte
7473
if hasForcedInclusionNs {
75-
namespaceForcedInclusionBz = namespace.NamespaceFromString(cfg.ForcedInclusionNamespace).Bytes()
74+
namespaceForcedInclusionBz = datypes.NamespaceFromString(cfg.ForcedInclusionNamespace).Bytes()
7675
}
7776

7877
return &client{
7978
da: cfg.DA,
8079
logger: cfg.Logger.With().Str("component", "da_client").Logger(),
8180
defaultTimeout: cfg.DefaultTimeout,
8281
batchSize: cfg.RetrieveBatchSize,
83-
namespaceBz: namespace.NamespaceFromString(cfg.Namespace).Bytes(),
84-
namespaceDataBz: namespace.NamespaceFromString(cfg.DataNamespace).Bytes(),
82+
namespaceBz: datypes.NamespaceFromString(cfg.Namespace).Bytes(),
83+
namespaceDataBz: datypes.NamespaceFromString(cfg.DataNamespace).Bytes(),
8584
namespaceForcedInclusionBz: namespaceForcedInclusionBz,
8685
hasForcedInclusionNs: hasForcedInclusionNs,
8786
}

block/internal/da/client_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
coreda "github.com/evstack/ev-node/core/da"
1313
datypes "github.com/evstack/ev-node/pkg/da/types"
14-
"github.com/evstack/ev-node/pkg/namespace"
1514
)
1615

1716
// mockDA is a simple mock implementation of coreda.DA for testing
@@ -330,7 +329,7 @@ func TestClient_Submit(t *testing.T) {
330329
DataNamespace: "test-data-namespace",
331330
})
332331

333-
encodedNamespace := namespace.NamespaceFromString("test-namespace")
332+
encodedNamespace := datypes.NamespaceFromString("test-namespace")
334333
result := client.Submit(context.Background(), tc.data, tc.gasPrice, encodedNamespace.Bytes(), tc.options)
335334

336335
assert.Equal(t, tc.expectedCode, result.Code)
@@ -449,7 +448,7 @@ func TestClient_Retrieve(t *testing.T) {
449448
DefaultTimeout: 5 * time.Second,
450449
})
451450

452-
encodedNamespace := namespace.NamespaceFromString("test-namespace")
451+
encodedNamespace := datypes.NamespaceFromString("test-namespace")
453452
result := client.Retrieve(context.Background(), dataLayerHeight, encodedNamespace.Bytes())
454453

455454
assert.Equal(t, tc.expectedCode, result.Code)
@@ -470,7 +469,7 @@ func TestClient_Retrieve(t *testing.T) {
470469
func TestClient_Retrieve_Timeout(t *testing.T) {
471470
logger := zerolog.Nop()
472471
dataLayerHeight := uint64(100)
473-
encodedNamespace := namespace.NamespaceFromString("test-namespace")
472+
encodedNamespace := datypes.NamespaceFromString("test-namespace")
474473

475474
t.Run("timeout during GetIDs", func(t *testing.T) {
476475
mockDAInstance := &mockDA{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package namespace
1+
package datypes
22

33
import (
44
"crypto/sha256"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package namespace
1+
package datypes
22

33
import (
44
"bytes"

0 commit comments

Comments
 (0)