whisper: remove some unneeded testing complexity

This commit is contained in:
Péter Szilágyi 2015-04-15 12:50:10 +03:00
parent bcf41797ca
commit 46ea193a49
3 changed files with 5 additions and 32 deletions

View File

@ -4,40 +4,11 @@ package whisper
import (
"bytes"
"fmt"
"io/ioutil"
"math/rand"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover"
)
// randomNodeID generates and returns a random P2P discovery node id for the
// whisper tests.
func randomNodeID() (id discover.NodeID) {
for i := range id {
id[i] = byte(rand.Intn(255))
}
return id
}
// randomNodeName generates and returns a random P2P node name for the whisper
// tests.
func randomNodeName() string {
return common.MakeName(fmt.Sprintf("whisper-go-test-%3d", rand.Intn(999)), "1.0")
}
// whisperCaps returns the node capabilities for running the whisper sub-protocol.
func whisperCaps() []p2p.Cap {
return []p2p.Cap{
p2p.Cap{
Name: protocolName,
Version: uint(protocolVersion),
},
}
}
// bufMsgPipe creates a buffered message pipe between two endpoints.
func bufMsgPipe() (*p2p.MsgPipeRW, *p2p.MsgPipeRW) {
A, midA := p2p.MsgPipe()

View File

@ -5,6 +5,7 @@ import (
"time"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover"
)
type testPeer struct {
@ -15,7 +16,7 @@ type testPeer struct {
func startTestPeer() *testPeer {
// Create a simulated P2P remote peer and data streams to it
remote := p2p.NewPeer(randomNodeID(), randomNodeName(), whisperCaps())
remote := p2p.NewPeer(discover.NodeID{}, "", nil)
tester, tested := p2p.MsgPipe()
// Create a whisper client and connect with it to the tester peer
@ -30,7 +31,7 @@ func startTestPeer() *testPeer {
client.handlePeer(remote, tested)
}()
// Assemble and return the test peer
return &testPeer{
client: client,
stream: tester,

View File

@ -5,13 +5,14 @@ import (
"time"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover"
)
func startTestCluster(n int) []*Whisper {
// Create the batch of simulated peers
nodes := make([]*p2p.Peer, n)
for i := 0; i < n; i++ {
nodes[i] = p2p.NewPeer(randomNodeID(), randomNodeName(), whisperCaps())
nodes[i] = p2p.NewPeer(discover.NodeID{}, "", nil)
}
whispers := make([]*Whisper, n)
for i := 0; i < n; i++ {