From 7abda07a53879c2437a2a3e2aa2abe436b571e87 Mon Sep 17 00:00:00 2001 From: nicksavers Date: Wed, 20 Aug 2014 20:59:07 +0200 Subject: [PATCH 1/2] Pretty-print block state dump --- .../src/main/java/org/ethereum/db/Repository.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ethereumj-core/src/main/java/org/ethereum/db/Repository.java b/ethereumj-core/src/main/java/org/ethereum/db/Repository.java index 953a3f75..8babea95 100644 --- a/ethereumj-core/src/main/java/org/ethereum/db/Repository.java +++ b/ethereumj-core/src/main/java/org/ethereum/db/Repository.java @@ -18,6 +18,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.spongycastle.util.encoders.Hex; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -407,12 +409,9 @@ public class Repository { ObjectNode blockNode = jsonFactory.objectNode(); JSONHelper.dumpBlock(blockNode, block, gasUsed, this.getWorldState().getRootHash(), keys, this); - bw.write(blockNode.toString()); - bw.write("\n"); - - String rootHash = Hex.toHexString(this.getWorldState().getRootHash()); - bw.write(String.format(" => Global State Root: [ %s ]", rootHash) - ); + ObjectMapper mapper = new ObjectMapper(); + mapper.enable(SerializationFeature.INDENT_OUTPUT); + bw.write(mapper.writeValueAsString(blockNode)); } catch (IOException e) { logger.error(e.getMessage(), e); From 6fa39c37a4e376026f8638b9589c64529d2a1473 Mon Sep 17 00:00:00 2001 From: nicksavers Date: Wed, 20 Aug 2014 21:19:42 +0200 Subject: [PATCH 2/2] Cleanup Gitignore --- .gitignore | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 9c46fe2e..4049a8a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,32 @@ - -.idea -*.iml +# Java *.class -*.xlsx +# Intellij +.idea/ +*.iml +*.iws # Eclipse .project .classpath -.settings +.settings/ /bin +# Maven +log/ +target/ + # Package Files # *.zip *.jar *.war *.ear -/target -/src/main/java/samples # Output # -/blockchain -/state -/details /logs /dmp /database -*.db -*.xlsx -/gen +/null + +# Mac +.DS_Store \ No newline at end of file