un-stub some ncli_db code so that it uses

status-im · Mar 4, 2021 · ae28a4c · ae28a4c
1 parent 6633ae0
commit ae28a4c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/beacon_chain/beacon_chain_db.nim b/beacon_chain/beacon_chain_db.nim
@@ -617,3 +617,7 @@ iterator getAncestorSummaries*(db: BeaconChainDB, root: Eth2Digest):
       break
 
     root = res.summary.parent_root
+
+proc loadImmutableValidators*(db: BeaconChainDB): seq[ImmutableValidatorData] =
+  for i in 0'u64 ..< db.immutableValidators.len:
+    result.add db.immutableValidators.get(i)
diff --git a/beacon_chain/block_pools/chain_dag.nim b/beacon_chain/block_pools/chain_dag.nim
@@ -304,10 +304,6 @@ proc loadStateCache*(cache: var StateCache, blck: BlockRef, epoch: Epoch) =
   if epoch > 0:
     load(epoch - 1)
 
-proc loadImmutableValidators(db: BeaconChainDB): seq[ImmutableValidatorData] =
-  for i in 0'u64 ..< db.immutableValidators.len:
-    result.add db.immutableValidators.get(i)
-
 func init(T: type BlockRef, root: Eth2Digest, slot: Slot): BlockRef =
   BlockRef(
     root: root,

diff --git a/ncli/ncli_db.nim b/ncli/ncli_db.nim
@@ -130,10 +130,9 @@ proc cmdBench(conf: DbConf, runtimePreset: RuntimePreset) =
     root: db.getBlock(blockRefs[^1].root).get().message.state_root
   )
 
-  var foo: seq[ImmutableValidatorData]
   withTimer(timers[tLoadState]):
-    discard db.getState(state[].root, state[].data, noRollback, foo)
-    #discard db.getState(state[].root, state[].data, noRollback, pool.iv)
+    discard db.getState(
+      state[].root, state[].data, noRollback, pool.immutableValidators)
 
   var cache = StateCache()
 
@@ -168,17 +167,16 @@ proc cmdBench(conf: DbConf, runtimePreset: RuntimePreset) =
   printTimers(false, timers)
 
 proc cmdDumpState(conf: DbConf, preset: RuntimePreset) =
-  let db = BeaconChainDB.init(preset, conf.databaseDir.string)
+  let
+    db = BeaconChainDB.init(preset, conf.databaseDir.string)
+    immutableValidators = db.loadImmutableValidators()
   defer: db.close()
 
-  var foo: seq[ImmutableValidatorData]
-  # TODO move the load-immutable-validators thing out of chain dag maybe, since
-  # want it here too. then use that instead of `foo`
   for stateRoot in conf.stateRoot:
     try:
       let root = Eth2Digest(data: hexToByteArray[32](stateRoot))
       var state = (ref HashedBeaconState)(root: root)
-      if not db.getState(root, state.data, noRollback, foo):
+      if not db.getState(root, state.data, noRollback, immutableValidators):
         echo "Couldn't load ", root
       else:
         dump("./", state[])
@@ -221,9 +219,9 @@ proc copyPrunedDatabase(
   let headEpoch = db.getBlock(headBlock.get).get.message.slot.epoch
 
   # Tail states are specially addressed; no stateroot intermediary
+  # TODO here, want to copy raw blocks, not the processed forms,
+  # and also the immutable validators; might need to adjust APIs
   var foo: seq[ImmutableValidatorData]
-  # TODO move the load-immutable-validators thing out of chain dag maybe, since
-  # want it here too. then use that instead of `foo`
   if not db.getState(
       db.getBlock(tailBlock.get).get.message.state_root, beaconState[],
       noRollback, foo):

diff --git a/tests/test_beacon_chain_db.nim b/tests/test_beacon_chain_db.nim
@@ -189,9 +189,6 @@ suiteReport "Beacon chain DB" & preset():
       immutableValidators: seq[ImmutableValidatorData] = @[]
 
     # TODO make sure there's a validator
-
-    # TODO it's fine, but maybe for testing purposes should be able to force a
-    # non-split-validators store. the interface isn't yet different
     db.putState(state[])
 
     check: