From 001dc0305b0190ca1490a9399cdc5ea5e052268f Mon Sep 17 00:00:00 2001
From: Jeromy <why@ipfs.io>
Date: Sat, 10 Sep 2016 06:26:09 -0700
Subject: [PATCH] encode peerID in base64 for messages over base58

---
 floodsub.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/floodsub.go b/floodsub.go
index 2bddef9..0cea178 100644
--- a/floodsub.go
+++ b/floodsub.go
@@ -2,6 +2,7 @@ package floodsub
 
 import (
 	"bufio"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"sync"
@@ -51,7 +52,7 @@ type Message struct {
 
 func (m *Message) MarshalJSON() ([]byte, error) {
 	return json.Marshal(map[string]interface{}{
-		"from":      m.From.Pretty(),
+		"from":      base64.RawStdEncoding.EncodeToString([]byte(m.From)),
 		"data":      m.Data,
 		"timestamp": m.Timestamp,
 		"topic":     m.Topic,
@@ -70,14 +71,15 @@ func (m *Message) UnmarshalJSON(data []byte) error {
 		return err
 	}
 
-	m.Data = mp.Data
-	m.Timestamp = mp.Timestamp
-	m.Topic = mp.Topic
-	from, err := peer.IDB58Decode(mp.From)
+	pid, err := base64.RawStdEncoding.DecodeString(mp.From)
 	if err != nil {
 		return err
 	}
-	m.From = from
+
+	m.Data = mp.Data
+	m.Timestamp = mp.Timestamp
+	m.Topic = mp.Topic
+	m.From = peer.ID(pid)
 	return nil
 }