From e80dda605130479086bed363e395a102a89a574a Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Thu, 19 Mar 2015 15:18:31 +0100
Subject: eth, whisper: adapt for RLP encoder switch in package p2p

I have rewritten the protocol test to use p2p.MsgPipe because
p2p.NewMsg is gone.
---
 whisper/peer.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'whisper/peer.go')

diff --git a/whisper/peer.go b/whisper/peer.go
index 4bd9428f5..ee5bffd0b 100644
--- a/whisper/peer.go
+++ b/whisper/peer.go
@@ -77,12 +77,11 @@ func (self *peer) broadcast(envelopes []*Envelope) error {
 	}
 
 	if i > 0 {
-		if err := p2p.EncodeMsg(self.ws, envelopesMsg, envs[:i]...); err != nil {
+		if err := p2p.Send(self.ws, envelopesMsg, envs[:i]); err != nil {
 			return err
 		}
 		self.peer.DebugDetailln("broadcasted", i, "message(s)")
 	}
-
 	return nil
 }
 
@@ -92,7 +91,7 @@ func (self *peer) addKnown(envelope *Envelope) {
 
 func (self *peer) handleStatus() error {
 	ws := self.ws
-	if err := ws.WriteMsg(self.statusMsg()); err != nil {
+	if err := p2p.SendItems(ws, statusMsg, protocolVersion); err != nil {
 		return err
 	}
 	msg, err := ws.ReadMsg()
@@ -115,7 +114,3 @@ func (self *peer) handleStatus() error {
 	}
 	return msg.Discard() // ignore anything after protocol version
 }
-
-func (self *peer) statusMsg() p2p.Msg {
-	return p2p.NewMsg(statusMsg, protocolVersion)
-}
-- 
cgit v1.2.3


From 483d43a15af11a9c456e4d9df0520441b947cd35 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Sat, 21 Mar 2015 00:49:58 +0100
Subject: whisper: use package rlp

---
 whisper/peer.go | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'whisper/peer.go')

diff --git a/whisper/peer.go b/whisper/peer.go
index ee5bffd0b..338166c25 100644
--- a/whisper/peer.go
+++ b/whisper/peer.go
@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	protocolVersion = 0x02
+	protocolVersion uint64 = 0x02
 )
 
 type peer struct {
@@ -66,21 +66,18 @@ out:
 }
 
 func (self *peer) broadcast(envelopes []*Envelope) error {
-	envs := make([]interface{}, len(envelopes))
-	i := 0
-	for _, envelope := range envelopes {
-		if !self.known.Has(envelope.Hash()) {
-			envs[i] = envelope
-			self.known.Add(envelope.Hash())
-			i++
+	envs := make([]*Envelope, 0, len(envelopes))
+	for _, env := range envelopes {
+		if !self.known.Has(env.Hash()) {
+			envs = append(envs, env)
+			self.known.Add(env.Hash())
 		}
 	}
-
-	if i > 0 {
-		if err := p2p.Send(self.ws, envelopesMsg, envs[:i]); err != nil {
+	if len(envs) > 0 {
+		if err := p2p.Send(self.ws, envelopesMsg, envs); err != nil {
 			return err
 		}
-		self.peer.DebugDetailln("broadcasted", i, "message(s)")
+		self.peer.DebugDetailln("broadcasted", len(envs), "message(s)")
 	}
 	return nil
 }
-- 
cgit v1.2.3