From 6d3bf7c18d3dcf2929bcb98dce88e16593e6f68c Mon Sep 17 00:00:00 2001
From: p4u <p4u@dabax.net>
Date: Mon, 11 Feb 2019 18:17:00 +0100
Subject: [PATCH] Fix dump function

---
 service/censusmanager.go |  2 +-
 tree/tree.go             | 26 +++++---------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/service/censusmanager.go b/service/censusmanager.go
index c84a9f1..aa9bfad 100644
--- a/service/censusmanager.go
+++ b/service/censusmanager.go
@@ -189,7 +189,7 @@ func claimHandler(w http.ResponseWriter, req *http.Request, op string) {
 				resp.Error = true
 				resp.Response = err.Error()
 			} else {
-				resp.Response = string(jValues)
+				resp.Response = fmt.Sprintf("%s", jValues)
 			}
 		}
 	}
diff --git a/tree/tree.go b/tree/tree.go
index d3bf3e3..7c466c0 100644
--- a/tree/tree.go
+++ b/tree/tree.go
@@ -3,6 +3,7 @@ package tree
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"os/user"
 
 	common3 "github.com/iden3/go-iden3/common"
@@ -51,7 +52,7 @@ func (t *Tree) GetClaim(data []byte) (*mkcore.ClaimBasic, error) {
 		return nil, errors.New("claim data too large")
 	}
 	for i := len(data); i <= 496/8; i++ {
-		data = append(data, byte('.'))
+		data = append(data, '\x00')
 	}
 	var indexSlot [400 / 8]byte
 	var dataSlot [496 / 8]byte
@@ -112,33 +113,16 @@ func (t *Tree) GetIndex(data []byte) (string, error) {
 	return index.String(), err
 }
 
-/*
 func (t *Tree) Dump() ([]string, error) {
 	var response []string
-
-	err := t.Tree.Walk(t.Tree.RootKey(), func(n *merkletree.Node) {
+	err := t.Tree.Walk(nil, func(n *merkletree.Node) {
 		if n.Type == merkletree.NodeTypeLeaf {
-			rawValue := n.Value()
-			var cleanValue []byte
-			for i := 0; i < len(rawValue); i++ {
-				if rawValue[i] == byte('.') {
-					break
-				}
-				cleanValue = append(cleanValue, rawValue[i])
-			}
-			response = append(response, fmt.Sprintf("%s", cleanValue))
+			data := bytes.Trim(n.Value()[65:], "\x00")
+			response = append(response, fmt.Sprintf("%s", data))
 		}
 	})
 	return response, err
 }
-*/
-
-func (t *Tree) Dump() (string, error) {
-	w := bytes.NewBufferString("")
-	err := t.Tree.DumpClaims(w, nil) // as rootKey we can pass a nil pointer, and it will use the current RootKey
-
-	return w.String(), err
-}
 
 func (t *Tree) Snapshot(root string) (*Tree, error) {
 	var rootHash merkletree.Hash