more fixes

status-im · Jun 3, 2024 · 6c5f591 · 6c5f591
1 parent bcca2df
commit 6c5f591
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/premix/dumper.nim b/premix/dumper.nim
@@ -16,6 +16,7 @@
 import
   stint,
   ../nimbus/common/common,
+  ../nimbus/db/opts,
   ../nimbus/db/core_db/persistent,
   ../nimbus/core/executor,
   ../nimbus/[vm_state, vm_types],
@@ -47,7 +48,8 @@ proc dumpDebug(com: CommonRef, blockNumber: UInt256) =
 
 proc main() {.used.} =
   let conf = getConfiguration()
-  let com = CommonRef.new(newCoreDbRef(DefaultDbPersistent, conf.dataDir))
+  let com = CommonRef.new(
+    newCoreDbRef(DefaultDbPersistent, conf.dataDir, DbOptions.init()))
 
   if conf.head != 0.u256:
     dumpDebug(com, conf.head)

diff --git a/premix/persist.nim b/premix/persist.nim
@@ -16,6 +16,7 @@ import
   ../nimbus/errors,
   ../nimbus/core/chain,
   ../nimbus/common,
+  ../nimbus/db/opts,
   ../nimbus/db/[core_db/persistent, storage_types],
   configuration  # must be late (compilation annoyance)
 
@@ -54,7 +55,7 @@ proc main() {.used.} =
 
   let conf = configuration.getConfiguration()
   let com = CommonRef.new(
-    newCoreDbRef(DefaultDbPersistent, conf.dataDir),
+    newCoreDbRef(DefaultDbPersistent, conf.dataDir, DbOptions.init()),
     conf.netId, networkParams(conf.netId))
 
   # move head to block number ...

diff --git a/premix/regress.nim b/premix/regress.nim
@@ -13,6 +13,7 @@ import
   ../nimbus/[vm_state, vm_types],
   ../nimbus/core/executor,
   ../nimbus/common/common,
+  ../nimbus/db/opts,
   ../nimbus/db/core_db/persistent,
   configuration # must be late (compilation annoyance)
 
@@ -52,7 +53,8 @@ proc validateBlock(com: CommonRef, blockNumber: BlockNumber): BlockNumber =
 proc main() {.used.} =
   let
     conf = getConfiguration()
-    com = CommonRef.new(newCoreDbRef(DefaultDbPersistent, conf.dataDir))
+    com = CommonRef.new(newCoreDbRef(
+      DefaultDbPersistent, conf.dataDir, DbOptions.init()))
 
   # move head to block number ...
   if conf.head == 0.u256:

diff --git a/tests/persistBlockTestGen.nim b/tests/persistBlockTestGen.nim
@@ -13,6 +13,7 @@ import
   ../nimbus/[tracer, config],
   ../nimbus/core/chain,
   ../nimbus/common/common,
+  ../nimbus/db/opts,
   ../nimbus/db/core_db/persistent
 
 proc dumpTest(com: CommonRef, blockNumber: int) =
@@ -58,7 +59,8 @@ proc main() {.used.} =
   # nimbus --rpcapi: eth, debug --prune: archive
 
   var conf = makeConfig()
-  let db = newCoreDbRef(DefaultDbPersistent, string conf.dataDir)
+  let db = newCoreDbRef(
+    DefaultDbPersistent, string conf.dataDir, DbOptions.init())
   let com = CommonRef.new(db)
 
   com.dumpTest(97)

diff --git a/tests/test_rpc_getproofs_track_state_changes.nim b/tests/test_rpc_getproofs_track_state_changes.nim
@@ -31,6 +31,7 @@ import
   ../nimbus/core/chain,
   ../nimbus/common/common,
   ../nimbus/rpc,
+  ../nimbus/db/opts,
   ../nimbus/db/core_db,
   ../nimbus/db/core_db/persistent,
   ../nimbus/db/state_db/base,
@@ -145,7 +146,8 @@ proc rpcGetProofsTrackStateChangesMain*() =
 
     test "Test tracking the changes introduced in every block":
 
-      let com = CommonRef.new(newCoreDbRef(DefaultDbPersistent, DATABASE_PATH))
+      let com = CommonRef.new(newCoreDbRef(
+        DefaultDbPersistent, DATABASE_PATH, DbOptions.init()))
       com.initializeEmptyDb()
 
       let

diff --git a/tests/tracerTestGen.nim b/tests/tracerTestGen.nim
@@ -11,6 +11,7 @@
 import
   json,
   ../nimbus/common/common, # must be early (compilation annoyance)
+  ../nimbus/db/opts,
   ../nimbus/db/core_db/persistent,
   ../nimbus/[config, tracer, vm_types]
 
@@ -57,7 +58,8 @@ proc main() {.used.} =
   # nimbus --rpc-api: eth, debug --prune: archive
 
   var conf = makeConfig()
-  let db = newCoreDbRef(DefaultDbPersistent, string conf.dataDir)
+  let db = newCoreDbRef(
+    DefaultDbPersistent, string conf.dataDir, DbOptions.init())
   let com = CommonRef.new(db)
 
   com.dumpTest(97)