From ea8b116fad3fc3a338e626f7cd03fc2ee052e7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartosz=20R=C3=B3=C5=BCa=C5=84ski?= <bartek.roza@gmail.com>
Date: Tue, 21 Jan 2025 17:16:28 +0100
Subject: [PATCH] Revert "Merge pull request #6641 from
 spacemeshos/node-split/setupDBs"

This reverts commit f31f02b771bf1bf7299cc0bc30f2e95194514ace, reversing
changes made to ef83c0cc2e8e97990e0aada568ed51ab74453bc3.
---
 node/node.go             | 16 +---------------
 node/smeshing_service.go |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/node/node.go b/node/node.go
index 9508ee7a6b..3be4268224 100644
--- a/node/node.go
+++ b/node/node.go
@@ -2162,7 +2162,7 @@ func (app *App) stopServices(ctx context.Context) {
 	grpczap.SetGrpcLoggerV2(grpcLog, log.NewNop().Zap())
 }
 
-func (app *App) setupStateAPIAndCacheDBs(ctx context.Context, lg log.Log) error {
+func (app *App) setupDBs(ctx context.Context, lg log.Log) error {
 	dbPath := app.Config.DataDir()
 	if err := os.MkdirAll(dbPath, os.ModePerm); err != nil {
 		return fmt.Errorf("failed to create %s: %w", dbPath, err)
@@ -2245,12 +2245,6 @@ func (app *App) setupStateAPIAndCacheDBs(ctx context.Context, lg log.Log) error
 		datastore.WithConsensusCache(app.atxsdata),
 	)
 
-	return nil
-}
-
-func (app *App) setupLocalDB(ctx context.Context, lg log.Log) error {
-	dbPath := app.Config.DataDir()
-	dbLog := app.addLogger(StateDbLogger, lg).Zap()
 	lSchema, err := localmigrations.SchemaWithInCodeMigrations()
 	if err != nil {
 		return fmt.Errorf("error loading db schema: %w", err)
@@ -2270,14 +2264,6 @@ func (app *App) setupLocalDB(ctx context.Context, lg log.Log) error {
 	return nil
 }
 
-func (app *App) setupDBs(ctx context.Context, lg log.Log) error {
-	if err := app.setupStateAPIAndCacheDBs(ctx, lg); err != nil {
-		return err
-	}
-
-	return app.setupLocalDB(ctx, lg)
-}
-
 // Start starts the Spacemesh node service and initializes all relevant
 // services according to command line arguments provided.
 func (app *App) Start(ctx context.Context) error {
diff --git a/node/smeshing_service.go b/node/smeshing_service.go
index 7bdf8f8df1..e7cfa28131 100644
--- a/node/smeshing_service.go
+++ b/node/smeshing_service.go
@@ -554,7 +554,7 @@ func (app *App) startSmeshingServiceSynchronous(ctx context.Context) (err error)
 		return fmt.Errorf("cannot create clock: %w", err)
 	}
 
-	if err := app.setupLocalDB(ctx, logger); err != nil {
+	if err := app.setupDBs(ctx, logger); err != nil {
 		return err
 	}