Merge pull request #343 from uprendis/feature/optimization-pack

Optimization package
Fantom-foundation · Aug 1, 2022 · 11c9b85 · 11c9b85
2 parents 59e2aac + 53eddab
commit 11c9b85
Show file tree

Hide file tree

Showing 67 changed files with 2,196 additions and 1,158 deletions.
diff --git a/cmd/opera/launcher/check.go b/cmd/opera/launcher/check.go
@@ -1,7 +1,6 @@
 package launcher
 
 import (
-	"path"
 	"time"
 
 	"github.com/Fantom-foundation/lachesis-base/inter/idx"
@@ -10,7 +9,6 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"gopkg.in/urfave/cli.v1"
 
-	"github.com/Fantom-foundation/go-opera/integration"
 	"github.com/Fantom-foundation/go-opera/inter"
 )
 
@@ -21,11 +19,8 @@ func checkEvm(ctx *cli.Context) error {
 
 	cfg := makeAllConfigs(ctx)
 
-	rawProducer := integration.DBProducer(path.Join(cfg.Node.DataDir, "chaindata"), cfg.cachescale)
-	gdb, err := makeRawGossipStore(rawProducer, cfg)
-	if err != nil {
-		log.Crit("DB opening error", "datadir", cfg.Node.DataDir, "err", err)
-	}
+	rawDbs := makeDirectDBsProducer(cfg)
+	gdb := makeGossipStore(rawDbs, cfg)
 	defer gdb.Close()
 	evms := gdb.EvmStore()
 
@@ -62,8 +57,7 @@ func checkEvm(ctx *cli.Context) error {
 		})
 	}
 
-	err = evms.CheckEvm(checkBlocks)
-	if err != nil {
+	if err := evms.CheckEvm(checkBlocks); err != nil {
 		return err
 	}
 	log.Info("EVM storage is verified", "last", prevPoint, "elapsed", common.PrettyDuration(time.Since(start)))

diff --git a/cmd/opera/launcher/config.go b/cmd/opera/launcher/config.go
@@ -148,7 +148,7 @@ type config struct {
 	Lachesis      abft.Config
 	LachesisStore abft.StoreConfig
 	VectorClock   vecmt.IndexConfig
-	cachescale    cachescale.Func
+	DBs           integration.DBsConfig
 }
 
 func (c *config) AppConfigs() integration.Configs {
@@ -158,6 +158,7 @@ func (c *config) AppConfigs() integration.Configs {
 		Lachesis:      c.Lachesis,
 		LachesisStore: c.LachesisStore,
 		VectorClock:   c.VectorClock,
+		DBs:           c.DBs,
 	}
 }
 
@@ -369,7 +370,6 @@ func mayMakeAllConfigs(ctx *cli.Context) (*config, error) {
 		Lachesis:      abft.DefaultConfig(),
 		LachesisStore: abft.DefaultStoreConfig(cacheRatio),
 		VectorClock:   vecmt.DefaultConfig(cacheRatio),
-		cachescale:    cacheRatio,
 	}
 
 	if ctx.GlobalIsSet(FakeNetFlag.Name) {
@@ -388,6 +388,17 @@ func mayMakeAllConfigs(ctx *cli.Context) (*config, error) {
 			return &cfg, err
 		}
 	}
+	// apply default for DB config if it wasn't touched by config file
+	dbDefault := integration.DefaultDBsConfig(cacheRatio.U64, uint64(utils.MakeDatabaseHandles()))
+	if len(cfg.DBs.Routing.Table) == 0 {
+		cfg.DBs.Routing = dbDefault.Routing
+	}
+	if len(cfg.DBs.GenesisCache.Table) == 0 {
+		cfg.DBs.GenesisCache = dbDefault.GenesisCache
+	}
+	if len(cfg.DBs.RuntimeCache.Table) == 0 {
+		cfg.DBs.RuntimeCache = dbDefault.RuntimeCache
+	}
 
 	// Apply flags (high priority)
 	var err error

diff --git a/cmd/opera/launcher/config_custom_test.go b/cmd/opera/launcher/config_custom_test.go
@@ -30,7 +30,6 @@ func TestConfigFile(t *testing.T) {
 		Lachesis:      abft.DefaultConfig(),
 		LachesisStore: abft.DefaultStoreConfig(cacheRatio),
 		VectorClock:   vecmt.DefaultConfig(cacheRatio),
-		cachescale:    cacheRatio,
 	}
 
 	canonical := func(nn []*enode.Node) []*enode.Node {

diff --git a/cmd/opera/launcher/consolecmd_test.go b/cmd/opera/launcher/consolecmd_test.go
@@ -24,7 +24,7 @@ const (
 // Tests that a node embedded within a console can be started up properly and
 // then terminated by closing the input stream.
 func TestConsoleWelcome(t *testing.T) {
-	// Start a opera console, make sure it's cleaned up and terminate the console
+	// Start an opera console, make sure it's cleaned up and terminate the console
 	cli := exec(t,
 		"--fakenet", "0/1", "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none",
 		"console")