Comments and cosmetics

nimbus/db/aristo/TODO.md

@@ -1,9 +1,4 @@
-* Re-visit `delTree()`. Suggestion is deleting small trees on the memory later,
-  otherwise only deleting the root vertex (so it becomes inaccessible) and
-  remember the follow up vertices which can travel through the tx-layers
-  to be picked up by the backend store.
-
-* Some comletions migh be needed for the `aristo_part` module which is a
+* Some comletions might be needed for the `aristo_part` module which is a
   re-implementation of the module supporting *proof-mode*/partial trees.
   + Complete `partMergeStorageData()`. This function might not be needed at
     all unless *snap-sync* is really revived.

nimbus/db/aristo/aristo_debug.nim

@@ -195,7 +195,7 @@ proc ppPayload(p: LeafPayload, db: AristoDbRef): string =
   of AccountData:
     result = "(" & p.account.ppAriAccount() & "," & p.stoID.ppVid & ")"
   of StoData:
-    result = $p.stoData
+    result = ($p.stoData).squeeze
 
 proc ppVtx(nd: VertexRef, db: AristoDbRef, rvid: RootedVertexID): string =
   if not nd.isValid:

nimbus/db/aristo/aristo_merge.nim

@@ -96,9 +96,9 @@ proc mergeGenericData*(
 
 proc mergeStorageData*(
     db: AristoDbRef;                   # Database, top layer
-    accPath: Hash256;          # Needed for accounts payload
-    stoPath: Hash256;          # Storage data path (aka key)
-    stoData: UInt256;          # Storage data payload value
+    accPath: Hash256;                  # Needed for accounts payload
+    stoPath: Hash256;                  # Storage data path (aka key)
+    stoData: UInt256;                  # Storage data payload value
       ): Result[void,AristoError] =
   ## Store the `stoData` data argument on the storage area addressed by
   ## `(accPath,stoPath)` where `accPath` is the account key (into the MPT)

tests/test_coredb/coredb_test_xx.nim

@@ -124,21 +124,21 @@ let
   mainTest6r* = mainSampleEx
     .cloneWith(
       name      = "-ex-ar-some",
-      numBlocks = 257_400,
+      numBlocks = 1_000_000,
       dbType    = AristoDbRocks,
       dbName    = "main-open") # for resuming on the same persistent DB
 
   mainTest7r* = mainSampleEx
     .cloneWith(
       name      = "-ex-ar-more",
-      numBlocks = 1_460_700,   # failure at 1,460,736
+      numBlocks = 1_500_000,
       dbType    = AristoDbRocks,
       dbName    = "main-open") # for resuming on the same persistent DB
 
   mainTest8r* = mainSampleEx
     .cloneWith(
       name      = "-ex-ar-more2",
-      numBlocks = 1_460_735,   # failure at 1,460,736
+      numBlocks = 2_000_000,
       dbType    = AristoDbRocks,
       dbName    = "main-open") # for resuming on the same persistent DB