From d91811fd8c83b60fb31bb32842c22c7c00ed7097 Mon Sep 17 00:00:00 2001
From: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>
Date: Wed, 29 Jul 2020 10:53:14 -0400
Subject: [PATCH] Merge PR #6882: server: cleanup

---
 server/constructors.go | 29 -----------------------------
 server/util.go         | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 31 deletions(-)
 delete mode 100644 server/constructors.go

diff --git a/server/constructors.go b/server/constructors.go
deleted file mode 100644
index 7f6f38b55..000000000
--- a/server/constructors.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package server
-
-import (
-	"io"
-	"os"
-	"path/filepath"
-
-	dbm "github.com/tendermint/tm-db"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-func openDB(rootDir string) (dbm.DB, error) {
-	dataDir := filepath.Join(rootDir, "data")
-	db, err := sdk.NewLevelDB("application", dataDir)
-	return db, err
-}
-
-func openTraceWriter(traceWriterFile string) (w io.Writer, err error) {
-	if traceWriterFile != "" {
-		w, err = os.OpenFile(
-			traceWriterFile,
-			os.O_WRONLY|os.O_APPEND|os.O_CREATE,
-			0666,
-		)
-		return
-	}
-	return
-}
diff --git a/server/util.go b/server/util.go
index 842bfbc83..6eaf23424 100644
--- a/server/util.go
+++ b/server/util.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net"
 	"os"
 	"os/signal"
@@ -11,19 +12,19 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/cosmos/cosmos-sdk/simapp"
-
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	tmcfg "github.com/tendermint/tendermint/config"
 	tmcli "github.com/tendermint/tendermint/libs/cli"
 	tmflags "github.com/tendermint/tendermint/libs/cli/flags"
 	"github.com/tendermint/tendermint/libs/log"
+	dbm "github.com/tendermint/tm-db"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server/config"
 	"github.com/cosmos/cosmos-sdk/server/types"
+	"github.com/cosmos/cosmos-sdk/simapp"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/version"
 )
@@ -289,3 +290,19 @@ func addrToIP(addr net.Addr) net.IP {
 	}
 	return ip
 }
+
+func openDB(rootDir string) (dbm.DB, error) {
+	dataDir := filepath.Join(rootDir, "data")
+	return sdk.NewLevelDB("application", dataDir)
+}
+
+func openTraceWriter(traceWriterFile string) (w io.Writer, err error) {
+	if traceWriterFile == "" {
+		return
+	}
+	return os.OpenFile(
+		traceWriterFile,
+		os.O_WRONLY|os.O_APPEND|os.O_CREATE,
+		0666,
+	)
+}