From ace551030fbe9288d0d8660f9431867a42e98c88 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Fri, 15 Aug 2014 01:08:23 +0200
Subject: [PATCH] Convert to hex

---
 ethpub/types.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ethpub/types.go b/ethpub/types.go
index faf75bbe1..159f7d9a7 100644
--- a/ethpub/types.go
+++ b/ethpub/types.go
@@ -221,15 +221,16 @@ func (self *PStateObject) EachStorage(cb ethtrie.EachCallback) {
 }
 
 type KeyVal struct {
-	Key   string
-	Value string
+	Key   string `json:"key"`
+	Value string `json:"value"`
 }
 
 func (c *PStateObject) StateKeyVal(asJson bool) interface{} {
 	var values []KeyVal
 	if c.object != nil {
 		c.object.EachStorage(func(name string, value *ethutil.Value) {
-			values = append(values, KeyVal{name, ethutil.Bytes2Hex(value.Bytes())})
+			value.Decode()
+			values = append(values, KeyVal{ethutil.Bytes2Hex([]byte(name)), ethutil.Bytes2Hex(value.Bytes())})
 		})
 	}
 
@@ -238,7 +239,7 @@ func (c *PStateObject) StateKeyVal(asJson bool) interface{} {
 		if err != nil {
 			return nil
 		}
-		fmt.Println(string(valuesJson))
+
 		return string(valuesJson)
 	}