Tree merging operation looks like working.

All tests working just fine.
rodoufu · Nov 15, 2018 · 6e5bc05 · 6e5bc05
1 parent 897c99c
commit 6e5bc05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/NeoDataStructure/MerklePatricia.cs b/NeoDataStructure/MerklePatricia.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace com.github.neoresearch.NeoDataStructure
 {
     using System.Text;
@@ -400,15 +398,15 @@ private string Merge(MerklePatricia mpA, MerklePatricia mpB, string hashA, strin
                 nodeHash = MergeCopy(hashA, mpA);
                 node = _db[nodeHash];
                 _db.Remove(nodeHash);
-                nodeHash = Set(node, 2 + nodeB[0].Length % 2 + lastNibble + nodeB[0].Substring(1), nodeB[1], nodeB[2]);
+                nodeHash = Set(node, nodeB[0].Substring(1), nodeB[1], nodeB[2]);
                 node = _db[nodeHash];
             }
             else if (nodeB.Length == NodeSize)
             {
                 nodeHash = MergeCopy(hashB, mpB);
                 node = _db[nodeHash];
                 _db.Remove(nodeHash);
-                nodeHash = Set(node, 2 + nodeA[0].Length % 2 + lastNibble + nodeA[0].Substring(1), nodeA[1], nodeA[2]);
+                nodeHash = Set(node, nodeA[0].Substring(1), nodeA[1], nodeA[2]);
                 node = _db[nodeHash];
             }
 

diff --git a/NeoDataStructureTest/MerklePatriciaMergeTest.cs b/NeoDataStructureTest/MerklePatriciaMergeTest.cs
@@ -198,7 +198,7 @@ public void Merge()
             };
             Assert.True(mpD.Validade());
             System.Console.WriteLine($"C:{mpC}");
-            System.Console.WriteLine($"D:{mpD}");
+            System.Console.WriteLine($"merge:{mpMerge}");
             Assert.Equal(mpC, mpD);
 
             Assert.Equal(mpC, mpMerge);