Merge branch 'master' of github.com:ledgerwatch/turbo-geth

Author: mandrigin

cmd/hack/lmdb.go cmd/hack/db/lmdb.gocmd/hack/lmdb.go renamed to cmd/hack/db/lmdb.go

@@ -1,4 +1,4 @@
-package main
+package db
 
 import (
 	"bufio"
@@ -327,7 +327,7 @@ func defragSteps(filename string, bucketsCfg dbutils.BucketsCfg, generateFs ...f
 			defer f.Close()
 			w := bufio.NewWriter(f)
 			defer w.Flush()
-			if err = textInfo(dir, w); err != nil {
+			if err = TextInfo(dir, w); err != nil {
 				return fmt.Errorf("textInfo for %s_%d: %w", filename, gi, err)
 			}
 			if err = w.Flush(); err != nil {
@@ -347,7 +347,7 @@ func defragSteps(filename string, bucketsCfg dbutils.BucketsCfg, generateFs ...f
 	return nil
 }
 
-func defrag() error {
+func Defrag() error {
 	emptyBucketCfg := make(dbutils.BucketsCfg)
 	if err := defragSteps("vis1", emptyBucketCfg, nothing); err != nil {
 		return err
@@ -441,7 +441,7 @@ func defrag() error {
 	return nil
 }
 
-func textInfo(chaindata string, visStream io.Writer) error {
+func TextInfo(chaindata string, visStream io.Writer) error {
 	log.Info("Text Info", "db", chaindata)
 	fmt.Fprintf(visStream, "digraph lmdb {\nrankdir=LR\n")
 	datafile := path.Join(chaindata, "data.mdb")

cmd/hack/cfg.go cmd/hack/flow/flow.gocmd/hack/cfg.go renamed to cmd/hack/flow/flow.go

@@ -1,13 +1,11 @@
-package main
+package flow
 
 import (
 	"bufio"
 	"encoding/hex"
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/ledgerwatch/turbo-geth/common"
-	"github.com/ledgerwatch/turbo-geth/core/vm"
 	"log"
 	"math/big"
 	"os"
@@ -16,19 +14,27 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/ledgerwatch/turbo-geth/cmd/hack/tool"
+	"github.com/ledgerwatch/turbo-geth/common"
+	"github.com/ledgerwatch/turbo-geth/core/vm"
 )
 
-var maxStackLen = 1024
-var maxStackCount = 25600000
-var maxAnlyCounterLimit = 1048756
-var maxSecs int64 = 600
-var maxMBs uint64 = 1000
+const (
+	maxStackLen         = 1024
+	maxStackCount       = 25600000
+	maxAnlyCounterLimit = 1048756
+	maxSecs             = int64(600)
+	maxMBs              = uint64(1000)
+)
 
-var mode = flag.String("mode", "test", "Mode for cfg analysis.")
-var bytecode = flag.String("bytecode", "0x00", "Bytecode for cfg analysis")
-var quiet = flag.Bool("quiet", false, "Quiet for cfg analysis")
+var (
+	mode     = flag.String("mode", "test", "Mode for cfg analysis.")
+	bytecode = flag.String("bytecode", "0x00", "Bytecode for cfg analysis")
+	quiet    = flag.Bool("quiet", false, "Quiet for cfg analysis")
+)
 
-func testGenCfg() {
+func TestGenCfg() {
 	if *mode == "worker" {
 		code, _ := hex.DecodeString(*bytecode)
 		worker(code)
@@ -154,7 +160,7 @@ func batchServer() {
 		}
 		row := strings.Split(line, ",")
 		txcnt, perr := strconv.ParseInt(row[0], 10, 64)
-		check(perr)
+		tool.Check(perr)
 
 		code, _ := hex.DecodeString(row[1][2:])
 		jobList = append(jobList, &cfgJob{int(txcnt), code})
@@ -206,7 +212,7 @@ func batchServer() {
 	filename := fmt.Sprintf("results_%v.csv", timestamp)
 	fmt.Printf("Writing results to %v\n", filename)
 	resultsFile, err := os.Create(filename)
-	check(err)
+	tool.Check(err)
 	headers := []string{"TxCount",
 		"BytecodeLen",
 		"Valid",
@@ -221,9 +227,9 @@ func batchServer() {
 		"ProofSize (bytes)",
 		"Bytecode"}
 	_, err = resultsFile.WriteString(strings.Join(headers, "|") + "\n")
-	check(err)
+	tool.Check(err)
 	err = resultsFile.Sync()
-	check(err)
+	tool.Check(err)
 
 	eval := CfgEval{numPrograms: 191400}
 	//numJobs := len(jobList)
@@ -246,10 +252,10 @@ func batchServer() {
 			hex.EncodeToString(result.job.code)}
 
 		_, err = resultsFile.WriteString(strings.Join(line, "|") + "\n")
-		check(err)
+		tool.Check(err)
 
 		err = resultsFile.Sync()
-		check(err)
+		tool.Check(err)
 
 		eval.update(result, 1)