Regex for removing unnecessary newlines, adjust tests.

Signed-off-by: Neo <[email protected]>
Quadratic-Labs · Nov 21, 2023 · de98029 · de98029
1 parent a6564c9
commit de98029
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 12 deletions.
diff --git a/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/SimpleVerkleTrie.java b/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/SimpleVerkleTrie.java
@@ -155,7 +155,7 @@ public void commit(final NodeUpdater nodeUpdater) {
    * @return The DOT representation of the Verkle Trie.
    */
   public String toDotTree(Boolean showRepeatingEdges) {
-    return String.format("digraph VerkleTrie {\n%s}\n", getRoot().toDot(showRepeatingEdges));
+    return String.format("digraph VerkleTrie {\n%s\n}", getRoot().toDot(showRepeatingEdges).replaceAll("^\\n+|\\n+$", ""));
   }
 
   /**

diff --git a/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/exporter/DotExporter.java b/src/main/java/org/hyperledger/besu/ethereum/trie/verkle/exporter/DotExporter.java
@@ -73,7 +73,7 @@ public static void exportToDotFile(String verkleTrieDotString, String filePath)
 
       try (BufferedWriter writer =
           new BufferedWriter(new FileWriter(path.toString(), StandardCharsets.UTF_8))) {
-        writer.write(verkleTrieDotString + "\n");
+        writer.write(verkleTrieDotString);
       }
 
     } catch (AccessDeniedException e) {

diff --git a/src/test/java/org/hyperledger/besu/ethereum/trie/verkle/DotDisplayTest.java b/src/test/java/org/hyperledger/besu/ethereum/trie/verkle/DotDisplayTest.java
@@ -58,6 +58,7 @@ public void testToDotTrieOneValueNoRepeatingEdgesExport() throws IOException {
     final String fileName = "expectedTreeOneValueNoRepeatingEdges.txt";
     final String expectedTree = getResources(fileName);
     final String actualTree = trie.toDotTree();
+    System.out.println(actualTree);
 
     assertEquals(expectedTree, actualTree);
   }

diff --git a/src/test/resources/VerkleTrie.gv b/src/test/resources/VerkleTrie.gv
@@ -516,5 +516,4 @@ NullNode0x[location="0x"]
 NullNode0x[location="0x"]
 NullNode0x[location="0x"]
 NullNode0x[location="0x"]
-}
-
+}
diff --git a/src/test/resources/expectedTreeOneValueNoRepeatingEdges.txt b/src/test/resources/expectedTreeOneValueNoRepeatingEdges.txt
@@ -516,5 +516,4 @@ NullNode0x[location="0x"]
 NullNode0x[location="0x"]
 NullNode0x[location="0x"]
 NullNode0x[location="0x"]
-}
-
+}
diff --git a/src/test/resources/expectedTreeOneValueRepeatingEdges.txt b/src/test/resources/expectedTreeOneValueRepeatingEdges.txt
@@ -1024,5 +1024,4 @@ InternalNode0x -> NullNode0x
 NullNode0x[location="0x"]
 InternalNode0x -> NullNode0x
 NullNode0x[location="0x"]
-}
-
+}
diff --git a/src/test/resources/expectedTreeTwoValuesNoRepeatingEdges.txt b/src/test/resources/expectedTreeTwoValuesNoRepeatingEdges.txt
@@ -517,5 +517,4 @@ NullNode0x[location="0x"]
 NullNode0x[location="0x"]
 NullNode0x[location="0x"]
 NullNode0x[location="0x"]
-}
-
+}
diff --git a/src/test/resources/expectedTreeTwoValuesRepeatingEdges.txt b/src/test/resources/expectedTreeTwoValuesRepeatingEdges.txt
@@ -1024,5 +1024,4 @@ InternalNode0x -> NullNode0x
 NullNode0x[location="0x"]
 InternalNode0x -> NullNode0x
 NullNode0x[location="0x"]
-}
-
+}