From 8148e9fea4ac459eef4ae930f82d35cf46eedf99 Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Fri, 30 Mar 2018 18:09:06 +0200 Subject: [PATCH] whisper: revert the special libp2p packet code handshake now works as it should, no need for custom protocol messages. --- whisper/whisperv6/doc.go | 1 - whisper/whisperv6/whisper.go | 1 - 2 files changed, 2 deletions(-) diff --git a/whisper/whisperv6/doc.go b/whisper/whisperv6/doc.go index 09b646873f..8cde3a719d 100644 --- a/whisper/whisperv6/doc.go +++ b/whisper/whisperv6/doc.go @@ -48,7 +48,6 @@ const ( messagesCode = 1 // normal whisper message powRequirementCode = 2 // PoW requirement bloomFilterExCode = 3 // bloom filter exchange - lp2pPeerCode = 125 // libp2p-based peer exchange protocol p2pRequestCode = 126 // peer-to-peer message, used by Dapp protocol p2pMessageCode = 127 // peer-to-peer message (to be consumed by the peer, but not forwarded any further) NumberOfMessageCodes = 128 diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go index b651a4ad63..a0fdbf4025 100644 --- a/whisper/whisperv6/whisper.go +++ b/whisper/whisperv6/whisper.go @@ -724,7 +724,6 @@ func (whisper *Whisper) runMessageLoop(p Peer, rw p2p.MsgReadWriter) error { return errors.New("invalid bloom filter exchange message") } p.setBloomFilter(bloom) - case lp2pPeerCode: case p2pMessageCode: // peer-to-peer message, sent directly to peer bypassing PoW checks, etc. // this message is not supposed to be forwarded to other peers, and