[filedao] remove checkMasterChainDBFile()

blockchain/filedao/filedao.go

@@ -84,20 +84,25 @@ type (
 
 // NewFileDAO creates an instance of FileDAO
 func NewFileDAO(cfg db.Config) (FileDAO, error) {
-	header, err := checkMasterChainDBFile(cfg.DbPath)
-	if err == ErrFileInvalid || err == ErrFileCantAccess {
+	header, err := readFileHeader(cfg.DbPath, FileAll)
+	switch err {
+	case nil:
+	case ErrFileInvalid, ErrFileCantAccess:
 		return nil, err
-	}
-
-	if err == ErrFileNotExist {
+	case ErrFileNotExist:
 		// start new chain db using v2 format
 		if err := createNewV2File(1, cfg); err != nil {
 			return nil, err
 		}
 		header = &FileHeader{Version: FileV2}
+	default:
+		return nil, err
 	}
 
 	switch header.Version {
+	case FileLegacyAuxiliary:
+		// default chain db file is legacy format, but not master, the master file has been corrupted
+		return nil, ErrFileInvalid
 	case FileLegacyMaster:
 		// master file is legacy format
 		return CreateFileDAO(true, cfg)

blockchain/filedao/filedao_test.go

@@ -140,7 +140,7 @@ func TestNewFileDAOSplitV2(t *testing.T) {
 	defer os.RemoveAll(cfg.DbPath)
 
 	// test non-existing file
-	_, err := checkMasterChainDBFile(cfg.DbPath)
+	_, err := readFileHeader(cfg.DbPath, FileAll)
 	r.Equal(ErrFileNotExist, err)
 
 	// test empty db file, this will create new v2 file

blockchain/filedao/filedao_util.go

@@ -20,23 +20,6 @@ import (
 	"github.com/iotexproject/iotex-core/db"
 )
 
-func checkMasterChainDBFile(defaultName string) (*FileHeader, error) {
-	h, err := readFileHeader(defaultName, FileAll)
-	if err == ErrFileNotExist || err == ErrFileInvalid || err == ErrFileCantAccess {
-		return nil, err
-	}
-
-	switch h.Version {
-	case FileLegacyAuxiliary:
-		// default chain db file is legacy format, but not master, the master file has been corrupted
-		return h, ErrFileInvalid
-	case FileLegacyMaster, FileV2:
-		return h, nil
-	default:
-		panic(fmt.Errorf("corrupted file version: %s", h.Version))
-	}
-}
-
 func readFileHeader(filename, fileType string) (*FileHeader, error) {
 	if err := fileExists(filename); err != nil {
 		return nil, err

ioctl/newcmd/node/node.go

@@ -2,7 +2,7 @@ package node
 
 import (
 	"github.com/spf13/cobra"
-	
+
 	"github.com/iotexproject/iotex-core/ioctl"
 	"github.com/iotexproject/iotex-core/ioctl/config"
 )