From dedfa143ce18186f296d0ec98c67817ab3f6b817 Mon Sep 17 00:00:00 2001
From: Phi <orjan.roren@gmail.com>
Date: Tue, 4 Jul 2023 11:30:06 +0200
Subject: [PATCH] Extract removeExistingChain to seperate func

Extract removeExistingChain to seperate func
---
 cmd/lotus/daemon.go | 90 ++++++++++++++++++++++-----------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/cmd/lotus/daemon.go b/cmd/lotus/daemon.go
index 2193dd1a5..9d7867cdc 100644
--- a/cmd/lotus/daemon.go
+++ b/cmd/lotus/daemon.go
@@ -304,52 +304,9 @@ var DaemonCmd = &cli.Command{
 				return xerrors.Errorf("lotus repo doesn't exist")
 			}
 
-			lockedRepo, err := lr.Lock(repo.FullNode)
+			err = removeExistingChain(cctx, lr)
 			if err != nil {
-				return xerrors.Errorf("error locking repo: %w", err)
-			}
-
-			cfg, err := lockedRepo.Config()
-			if err != nil {
-				lockedRepo.Close()
-				return xerrors.Errorf("error getting config: %w", err)
-			}
-
-			fullNodeConfig, ok := cfg.(*config.FullNode)
-			if !ok {
-				lockedRepo.Close()
-				return xerrors.Errorf("wrong config type: %T", cfg)
-			}
-
-			if fullNodeConfig.Chainstore.EnableSplitstore {
-				log.Info("removing splitstore directory...")
-				err = deleteSplitstoreDir(lockedRepo)
-				if err != nil {
-					lockedRepo.Close()
-					return xerrors.Errorf("error removing splitstore directory: %w", err)
-				}
-			}
-
-			// Get the base repo path
-			repoPath := lockedRepo.Path()
-
-			// Construct the path to the chain directory
-			chainPath := filepath.Join(repoPath, "datastore", "chain")
-
-			log.Info("removing chain directory:", chainPath)
-
-			err = os.RemoveAll(chainPath)
-			if err != nil {
-				lockedRepo.Close()
-				return xerrors.Errorf("error removing chain directory: %w", err)
-			}
-
-			log.Info("chain and splitstore data have been removed")
-
-			// Explicitly close the lockedRepo now that we're done with it.
-			err = lockedRepo.Close()
-			if err != nil {
-				return xerrors.Errorf("error releasing lock: %w", err)
+				return err
 			}
 		}
 
@@ -791,6 +748,49 @@ func slashFilterMinedBlock(ctx context.Context, sf *slashfilter.SlashFilter, a l
 	return nil, nil, nil
 }
 
+func removeExistingChain(cctx *cli.Context, lr repo.Repo) error {
+	lockedRepo, err := lr.Lock(repo.FullNode)
+	if err != nil {
+		return xerrors.Errorf("error locking repo: %w", err)
+	}
+	// Ensure that lockedRepo is closed when this function exits
+	defer lockedRepo.Close()
+
+	cfg, err := lockedRepo.Config()
+	if err != nil {
+		return xerrors.Errorf("error getting config: %w", err)
+	}
+
+	fullNodeConfig, ok := cfg.(*config.FullNode)
+	if !ok {
+		return xerrors.Errorf("wrong config type: %T", cfg)
+	}
+
+	if fullNodeConfig.Chainstore.EnableSplitstore {
+		log.Info("removing splitstore directory...")
+		err = deleteSplitstoreDir(lockedRepo)
+		if err != nil {
+			return xerrors.Errorf("error removing splitstore directory: %w", err)
+		}
+	}
+
+	// Get the base repo path
+	repoPath := lockedRepo.Path()
+
+	// Construct the path to the chain directory
+	chainPath := filepath.Join(repoPath, "datastore", "chain")
+
+	log.Info("removing chain directory:", chainPath)
+
+	err = os.RemoveAll(chainPath)
+	if err != nil {
+		return xerrors.Errorf("error removing chain directory: %w", err)
+	}
+
+	log.Info("chain and splitstore data have been removed")
+	return nil
+}
+
 func deleteSplitstoreDir(lr repo.LockedRepo) error {
 	path, err := lr.SplitstorePath()
 	if err != nil {