Merge branch 'master' into drop-p2p-options

OffchainLabs · Jul 9, 2024 · e883a46 · e883a46
2 parents ffa14d0 + affe0de
commit e883a46
Show file tree

Hide file tree

Showing 7 changed files with 959 additions and 42 deletions.
diff --git a/das/das_test.go b/das/das_test.go
@@ -40,8 +40,9 @@ func testDASStoreRetrieveMultipleInstances(t *testing.T, storageType string) {
 			KeyDir: dbPath,
 		},
 		LocalFileStorage: LocalFileStorageConfig{
-			Enable:  enableFileStorage,
-			DataDir: dbPath,
+			Enable:       enableFileStorage,
+			DataDir:      dbPath,
+			MaxRetention: DefaultLocalFileStorageConfig.MaxRetention,
 		},
 		LocalDBStorage:     dbConfig,
 		ParentChainNodeURL: "none",
@@ -129,8 +130,9 @@ func testDASMissingMessage(t *testing.T, storageType string) {
 			KeyDir: dbPath,
 		},
 		LocalFileStorage: LocalFileStorageConfig{
-			Enable:  enableFileStorage,
-			DataDir: dbPath,
+			Enable:       enableFileStorage,
+			DataDir:      dbPath,
+			MaxRetention: DefaultLocalFileStorageConfig.MaxRetention,
 		},
 		LocalDBStorage:     dbConfig,
 		ParentChainNodeURL: "none",

diff --git a/das/factory.go b/das/factory.go
@@ -35,7 +35,11 @@ func CreatePersistentStorageService(
 	}
 
 	if config.LocalFileStorage.Enable {
-		s, err := NewLocalFileStorageService(config.LocalFileStorage.DataDir)
+		s, err := NewLocalFileStorageService(config.LocalFileStorage)
+		if err != nil {
+			return nil, nil, err
+		}
+		err = s.start(ctx)
 		if err != nil {
 			return nil, nil, err
 		}