Skip to content

Commit bfc0b6f

Browse files
committed
fix config
1 parent bf72f14 commit bfc0b6f

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

pkg/config/config.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,8 @@ func (d *DAConfig) GetDataNamespace() string {
176176
if d.DataNamespace != "" {
177177
return d.DataNamespace
178178
}
179-
if d.Namespace != "" {
180-
return d.Namespace
181-
}
182-
return "rollkit-data" // Default value
179+
180+
return d.GetNamespace()
183181
}
184182

185183
// NodeConfig contains all Rollkit specific configuration parameters

pkg/config/config_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -283,35 +283,35 @@ signer:
283283
func TestDAConfig_GetDataNamespace(t *testing.T) {
284284
tests := []struct {
285285
name string
286+
defaultNamespace string
286287
dataNamespace string
287-
legacyNamespace string
288288
expectedNamespace string
289289
}{
290290
{
291291
name: "DataNamespace set",
292292
dataNamespace: "custom-data",
293-
legacyNamespace: "legacy-namespace",
293+
defaultNamespace: "namespace",
294294
expectedNamespace: "custom-data",
295295
},
296296
{
297-
name: "DataNamespace empty, fallback to legacy",
297+
name: "DataNamespace empty, fallback to default namespace",
298298
dataNamespace: "",
299-
legacyNamespace: "legacy-namespace",
300-
expectedNamespace: "legacy-namespace",
299+
defaultNamespace: "namespace",
300+
expectedNamespace: "namespace",
301301
},
302302
{
303-
name: "Both empty, use default",
303+
name: "Both empty, use default value from default namespace",
304304
dataNamespace: "",
305-
legacyNamespace: "",
306-
expectedNamespace: "rollkit-data",
305+
defaultNamespace: "",
306+
expectedNamespace: "rollkit-headers",
307307
},
308308
}
309309

310310
for _, tt := range tests {
311311
t.Run(tt.name, func(t *testing.T) {
312312
daConfig := &DAConfig{
313313
DataNamespace: tt.dataNamespace,
314-
Namespace: tt.legacyNamespace,
314+
Namespace: tt.defaultNamespace,
315315
}
316316

317317
result := daConfig.GetDataNamespace()

0 commit comments

Comments
 (0)