make setup for profiling6

Author: Andrei Ivasko

cmd/opera/launcher/erigoncmd.go

@@ -49,7 +49,7 @@ func writeErigon(ctx *cli.Context) error {
 
 	cfg := makeAllConfigs(ctx)
 
-	rawProducer := integration.DBProducer(path.Join(cfg.Node.DataDir, "chaindata"), cacheScaler(ctx))
+	rawProducer := integration.DBProducer(path.Join(erigon.DefaultDataDir(), "chaindata"), cacheScaler(ctx))
 
 	gdb, err := makeRawGossipStore(rawProducer, cfg)
 	if err != nil {

gossip/erigon/plain_state.go

@@ -52,7 +52,7 @@ func openDatabase(logger logger.Instance, label kv.Label) (kv.RwDB, error) {
 	}
 	var db kv.RwDB
 
-	dbPath := filepath.Join(defaultDataDir(), "erigon", name)
+	dbPath := filepath.Join(DefaultDataDir(), "erigon", name)
 
 	var openFunc func(exclusive bool) (kv.RwDB, error)
 	logger.Log.Info("Opening Database", "label", name, "path", dbPath)
@@ -88,7 +88,7 @@ func openDatabase(logger logger.Instance, label kv.Label) (kv.RwDB, error) {
 		if err != nil {
 			return nil, err
 		}
-		if err = migrator.Apply(db, defaultDataDir()); err != nil {
+		if err = migrator.Apply(db, DefaultDataDir()); err != nil {
 			return nil, err
 		}
 		db.Close()

gossip/erigon/preimages.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"strings"
 	"time"
+	"path/filepath"
 
 	"github.com/ethereum/go-ethereum/rlp"
 
@@ -19,12 +20,13 @@ import (
 	"github.com/ledgerwatch/erigon/crypto"
 )
 
-// THis path denotes path to preimages in profiling6 server
-const defaultPreimagesPath = "/var/data/preimages/preimages.gz"
+
 
 // WritePreimagesToSenders writes preimages to erigon kv.Senders table
 func WritePreimagesToSenders(db kv.RwDB) error {
 
+	// THis path denotes path to preimages in profiling6 server
+	defaultPreimagesPath := filepath.Join(DefaultDataDir(), "/preimages/preimages.gz")
 	start := time.Now()
 	log.Info("Reading preimages", "from file", defaultPreimagesPath)
 

gossip/erigon/utils.go

@@ -6,8 +6,6 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
-
-	"os/user"
 )
 
 func homeDir() string {
@@ -22,7 +20,7 @@ func homeDir() string {
 	return "/var/data/"
 }
 
-func defaultDataDir() string {
+func DefaultDataDir() string {
 	// Try to place the data folder in the user's home dir
 	home := homeDir()
 	if home != "" {