forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 18:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

whisper: warning removal

Browse source
This commit is contained in:
Guillaume Ballet 2018-02-19 14:49:41 +01:00
parent c94fb219c0
commit 989148b7c8
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
whisper/whisperv6/libp2p_glue.go
View file

@ -26,6 +26,8 @@ import (
inet "github.com/libp2p/go-libp2p-net" inet "github.com/libp2p/go-libp2p-net"
) )
// LibP2PStream is a wrapper used to implement the MsgReadWriter
// interface for libp2p's streams.
type LibP2PStream struct { type LibP2PStream struct {
stream inet.Stream stream inet.Stream
} }

22
whisper/whisperv6/libp2p_glue_test.go
View file

@ -17,18 +17,18 @@
package whisperv6 package whisperv6
import ( import (
"math"
"encoding/binary"
"context"
"bytes" "bytes"
"testing" "context"
"encoding/binary"
"math"
"math/rand" "math/rand"
"testing"
"github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/p2p"
host "github.com/libp2p/go-libp2p-host" host "github.com/libp2p/go-libp2p-host"
inet "github.com/libp2p/go-libp2p-net"
mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
testutil "github.com/libp2p/go-testutil" testutil "github.com/libp2p/go-testutil"
inet "github.com/libp2p/go-libp2p-net"
) )
const ( const (
@ -82,10 +82,10 @@ func TestSimpleCode(t *testing.T) {
t.Fatalf("Read %d random bytes instead of the expected %d, err: %v", n, size, err) t.Fatalf("Read %d random bytes instead of the expected %d, err: %v", n, size, err)
} }
hosts[0].SetStreamHandler(testProtocolID, func (s inet.Stream) { hosts[0].SetStreamHandler(testProtocolID, func(s inet.Stream) {
defer s.Close() defer s.Close()
raw := make([]byte, size + codeLength + payloadSizeLength) raw := make([]byte, size+codeLength+payloadSizeLength)
n, err = s.Read(raw) n, err = s.Read(raw)
if len(raw) != n || err != nil { if len(raw) != n || err != nil {
@ -135,7 +135,7 @@ func TestSimpleDecode(t *testing.T) {
ctx := context.Background() ctx := context.Background()
hosts := createTestNetwork(ctx, t, 2) hosts := createTestNetwork(ctx, t, 2)
hosts[0].SetStreamHandler(testProtocolID, func (s inet.Stream) { hosts[0].SetStreamHandler(testProtocolID, func(s inet.Stream) {
defer s.Close() defer s.Close()
lps := LibP2PStream{ lps := LibP2PStream{
@ -180,7 +180,7 @@ func TestSimpleCodeDecode(t *testing.T) {
t.Fatalf("Read %d random bytes instead of the expected %d, err: %v", n, size, err) t.Fatalf("Read %d random bytes instead of the expected %d, err: %v", n, size, err)
} }
hosts[0].SetStreamHandler(testProtocolID, func (s inet.Stream) { hosts[0].SetStreamHandler(testProtocolID, func(s inet.Stream) {
defer s.Close() defer s.Close()
lps := LibP2PStream{ lps := LibP2PStream{
@ -245,7 +245,7 @@ func TestMaxWriteSize(t *testing.T) {
t.Fatalf("Read %d random bytes instead of the expected %d, err: %v", n, size, err) t.Fatalf("Read %d random bytes instead of the expected %d, err: %v", n, size, err)
} }
hosts[0].SetStreamHandler(testProtocolID, func (s inet.Stream) { hosts[0].SetStreamHandler(testProtocolID, func(s inet.Stream) {
defer s.Close() defer s.Close()
dummy := []byte{0x0} dummy := []byte{0x0}
@ -258,7 +258,7 @@ func TestMaxWriteSize(t *testing.T) {
msg := p2p.Msg{ msg := p2p.Msg{
Code: code, Code: code,
Size: math.MaxInt32+1, Size: math.MaxInt32 + 1,
Payload: bytes.NewReader(payload), Payload: bytes.NewReader(payload),
} }