pass config by parameter

ava-labs · Apr 26, 2024 · 4aec589 · 4aec589
1 parent 058d7e7
commit 4aec589
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/merkle/merkle.go b/merkle/merkle.go
@@ -7,13 +7,12 @@ import (
 	"github.com/ava-labs/avalanchego/database/memdb"
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/trace"
-	"github.com/ava-labs/avalanchego/utils/units"
 	"github.com/ava-labs/avalanchego/x/merkledb"
 	"github.com/ava-labs/hypersdk/utils"
 )
 
 // Generate merkle root for a set of items
-func GenerateMerkleRoot(ctx context.Context, tracer trace.Tracer, merkleItems [][]byte, consumeBytes bool) (ids.ID, merkledb.MerkleDB, error) {
+func GenerateMerkleRoot(ctx context.Context, config merkledb.Config, tracer trace.Tracer, merkleItems [][]byte, consumeBytes bool) (ids.ID, merkledb.MerkleDB, error) {
 	batchOps := make([]database.BatchOp, 0, len(merkleItems))
 
 	for _, item := range merkleItems {
@@ -24,13 +23,7 @@ func GenerateMerkleRoot(ctx context.Context, tracer trace.Tracer, merkleItems []
 		})
 	}
 
-	db, err := merkledb.New(ctx, memdb.New(), merkledb.Config{
-		BranchFactor:              merkledb.BranchFactor16,
-		HistoryLength:             100,
-		IntermediateNodeCacheSize: units.MiB,
-		ValueNodeCacheSize:        units.MiB,
-		Tracer:                    tracer,
-	})
+	db, err := merkledb.New(ctx, memdb.New(), config)
 	if err != nil {
 		return ids.Empty, nil, err
 	}

diff --git a/merkle/merkle_test.go b/merkle/merkle_test.go
@@ -3,12 +3,13 @@ package merkle
 import (
 	"testing"
 
-	"crypto/rand"
 	"context"
+	"crypto/rand"
 	"strconv"
 
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/trace"
+	"github.com/ava-labs/avalanchego/utils/units"
 	"github.com/ava-labs/avalanchego/x/merkledb"
 )
 
@@ -34,10 +35,18 @@ func BenchmarkMerkleTxRoot(b *testing.B) {
     var db merkledb.MerkleDB
     var err error
 
+    defaultConfig := merkledb.Config{
+      BranchFactor:              merkledb.BranchFactor16,
+      HistoryLength:             100,
+      IntermediateNodeCacheSize: units.MiB,
+      ValueNodeCacheSize:        units.MiB,
+      Tracer:                    tracer,
+    }
+
 		b.Run(strconv.Itoa(size), func(b *testing.B) {
 			for n := 0; n < b.N; n++ {
 				for i := 0; i < size; i++ {
-          root, db, err = GenerateMerkleRoot(ctx, tracer, merkleItems, false)
+          root, db, err = GenerateMerkleRoot(ctx, defaultConfig, tracer, merkleItems, false)
 				}
 			}
 		})