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

swarm/network: Renamed DefaultNetworkID variable to TestProtocolNetworkID

Browse source
This commit is contained in:
Attila Gazso 2018-07-30 15:56:01 +02:00
parent 4835322064
commit 3a15c27c41
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
swarm/network/protocol_test.go
View file

@ -30,7 +30,10 @@ import (
p2ptest "github.com/ethereum/go-ethereum/p2p/testing" p2ptest "github.com/ethereum/go-ethereum/p2p/testing"
) )
const TestProtocolVersion = 5 const (
TestProtocolVersion = 5
TestProtocolNetworkID = 3
)
var ( var (
loglevel = flag.Int("loglevel", 2, "verbosity of logs") loglevel = flag.Int("loglevel", 2, "verbosity of logs")
@ -196,7 +199,7 @@ func (s *bzzTester) testHandshake(lhs, rhs *HandshakeMsg, disconnects ...*p2ptes
func correctBzzHandshake(addr *BzzAddr, lightNode bool) *HandshakeMsg { func correctBzzHandshake(addr *BzzAddr, lightNode bool) *HandshakeMsg {
return &HandshakeMsg{ return &HandshakeMsg{
Version: TestProtocolVersion, Version: TestProtocolVersion,
NetworkID: DefaultNetworkID, NetworkID: TestProtocolNetworkID,
Addr: addr, Addr: addr,
LightNode: lightNode, LightNode: lightNode,
} }
@ -227,7 +230,7 @@ func TestBzzHandshakeVersionMismatch(t *testing.T) {
err := s.testHandshake( err := s.testHandshake(
correctBzzHandshake(addr, lightNode), correctBzzHandshake(addr, lightNode),
&HandshakeMsg{Version: 0, NetworkID: DefaultNetworkID, Addr: NewAddrFromNodeID(id)}, &HandshakeMsg{Version: 0, NetworkID: TestProtocolNetworkID, Addr: NewAddrFromNodeID(id)},
&p2ptest.Disconnect{Peer: id, Error: fmt.Errorf("Handshake error: Message handler error: (msg code 0): version mismatch 0 (!= %d)", TestProtocolVersion)}, &p2ptest.Disconnect{Peer: id, Error: fmt.Errorf("Handshake error: Message handler error: (msg code 0): version mismatch 0 (!= %d)", TestProtocolVersion)},
) )
@ -244,7 +247,7 @@ func TestBzzHandshakeSuccess(t *testing.T) {
err := s.testHandshake( err := s.testHandshake(
correctBzzHandshake(addr, lightNode), correctBzzHandshake(addr, lightNode),
&HandshakeMsg{Version: TestProtocolVersion, NetworkID: DefaultNetworkID, Addr: NewAddrFromNodeID(id)}, &HandshakeMsg{Version: TestProtocolVersion, NetworkID: TestProtocolNetworkID, Addr: NewAddrFromNodeID(id)},
) )
if err != nil { if err != nil {
@ -261,7 +264,7 @@ func TestBzzHandshakeLightNodeOff(t *testing.T) {
err := pt.testHandshake( err := pt.testHandshake(
correctBzzHandshake(randomAddr, false), correctBzzHandshake(randomAddr, false),
&HandshakeMsg{Version: TestProtocolVersion, NetworkID: DefaultNetworkID, Addr: addr, LightNode: peerLightNode}, &HandshakeMsg{Version: TestProtocolVersion, NetworkID: TestProtocolNetworkID, Addr: addr, LightNode: peerLightNode},
) )
if err != nil { if err != nil {
@ -282,7 +285,7 @@ func TestBzzHandshakeLightNodeOn(t *testing.T) {
err := pt.testHandshake( err := pt.testHandshake(
correctBzzHandshake(randomAddr, false), correctBzzHandshake(randomAddr, false),
&HandshakeMsg{Version: TestProtocolVersion, NetworkID: DefaultNetworkID, Addr: addr, LightNode: peerLightNode}, &HandshakeMsg{Version: TestProtocolVersion, NetworkID: TestProtocolNetworkID, Addr: addr, LightNode: peerLightNode},
) )
if err != nil { if err != nil {