wip

Author: s2quake

src/Libplanet.Store/Trie/NodeExtensions.cs

@@ -10,12 +10,9 @@ public static IEnumerable<INode> SelfAndDescendants(this INode @this)
     {
         yield return @this;
 
-        foreach (var child in @this.Children)
+        foreach (var child in GetChildren(@this))
         {
-            foreach (var descendant in child.SelfAndDescendants())
-            {
-                yield return descendant;
-            }
+            yield return child;
         }
     }
 
@@ -43,6 +40,13 @@ private static IEnumerable<KeyValuePair<KeyBytes, IValue>> GetNodes(INode node,
     {
         if (node is FullNode fullNode)
         {
+            if (fullNode.Value is ValueNode valueNode)
+            {
+                var key = nibbles.ToKeyBytes();
+                var value = valueNode.Value;
+                yield return new(key, value);
+            }
+
             foreach (var (key, value) in fullNode.Children)
             {
                 var nodeNibble = nibbles.Append(key);
@@ -74,6 +78,7 @@ private static IEnumerable<INode> GetChildren(INode node)
     {
         foreach (var child in node.Children)
         {
+            yield return child;
             foreach (var item in GetChildren(child))
             {
                 yield return item;

src/Libplanet.Store/Trie/Nodes/FullNode.cs

@@ -16,7 +16,21 @@ public sealed record class FullNode(ImmutableDictionary<byte, INode> Children, I
 
     public ImmutableDictionary<byte, INode> Children { get; } = ValidateChildren(Children);
 
-    IEnumerable<INode> INode.Children => Children.Values;
+    IEnumerable<INode> INode.Children
+    {
+        get
+        {
+            if (Value is not null)
+            {
+                yield return Value;
+            }
+
+            foreach (var child in Children)
+            {
+                yield return child.Value;
+            }
+        }
+    }
 
     public INode? GetChild(byte index)
     {

src/Libplanet.Store/Trie/TrieExtensions.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Bencodex.Types;
-using Libplanet.Store.Trie.Nodes;
 
 namespace Libplanet.Store.Trie;
 

test/Libplanet.Tests/Store/Trie/MerkleTrieTest.cs

@@ -106,7 +106,7 @@ public void IterateSubTrie(bool commit, string extraKey)
 
         trie = trie.Set(extraKey, new Text(extraKey));
         trie = commit ? stateStore.Commit(trie) : trie;
-        Assert.Equal(3, trie.GetNode(prefixKey).Descendants().Count());
+        Assert.Equal(3, trie.GetNode(prefixKey).SelfAndDescendants().OfType<ValueNode>().Count());
         Assert.Equal(3, trie.GetNode(prefixKey).KeyValues().Count());
     }