From 828b4894384d373cda58e72cd4321831ac6cea5b Mon Sep 17 00:00:00 2001
From: lash <dev@holbrook.no>
Date: Wed, 13 Mar 2019 13:23:09 +0100
Subject: [PATCH] p2p, swarm: Make p2p/protocols tests pass + rename types.go

---
 p2p/protocols/protocol_test.go         | 17 ++++++++++++-----
 p2p/testing/protocoltester.go          |  1 -
 swarm/network/{types.go => network.go} |  0
 3 files changed, 12 insertions(+), 6 deletions(-)
 rename swarm/network/{types.go => network.go} (100%)

diff --git a/p2p/protocols/protocol_test.go b/p2p/protocols/protocol_test.go
index f9cf777977..9ac76ea2fd 100644
--- a/p2p/protocols/protocol_test.go
+++ b/p2p/protocols/protocol_test.go
@@ -27,6 +27,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/rlp"
 
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
@@ -144,8 +145,11 @@ func newProtocol(pp *p2ptest.TestPeerPool) func(*p2p.Peer, p2p.MsgReadWriter) er
 }
 
 func protocolTester(pp *p2ptest.TestPeerPool) *p2ptest.ProtocolTester {
-	conf := adapters.RandomNodeConfig()
-	return p2ptest.NewProtocolTester(conf.ID, 2, newProtocol(pp))
+	prvkey, err := crypto.GenerateKey()
+	if err != nil {
+		panic(err)
+	}
+	return p2ptest.NewProtocolTester(prvkey, 2, newProtocol(pp))
 }
 
 func protoHandshakeExchange(id enode.ID, proto *protoHandshake) []p2ptest.Exchange {
@@ -260,9 +264,12 @@ func TestProtocolHook(t *testing.T) {
 		return peer.Run(handle)
 	}
 
-	conf := adapters.RandomNodeConfig()
-	tester := p2ptest.NewProtocolTester(conf.ID, 2, runFunc)
-	err := tester.TestExchanges(p2ptest.Exchange{
+	prvkey, err := crypto.GenerateKey()
+	if err != nil {
+		panic(err)
+	}
+	tester := p2ptest.NewProtocolTester(prvkey, 2, runFunc)
+	err = tester.TestExchanges(p2ptest.Exchange{
 		Expects: []p2ptest.Expect{
 			{
 				Code: 0,
diff --git a/p2p/testing/protocoltester.go b/p2p/testing/protocoltester.go
index e7f2d05bdb..1e1752af8a 100644
--- a/p2p/testing/protocoltester.go
+++ b/p2p/testing/protocoltester.go
@@ -86,7 +86,6 @@ func NewProtocolTester(prvkey *ecdsa.PrivateKey, nodeCount int, run func(*p2p.Pe
 		}
 		if err := net.Start(peers[i].ID); err != nil {
 			panic(fmt.Sprintf("error starting peer %v: %v", peers[i].ID, err))
-			panic(err.Error())
 		}
 		nodes[i] = peers[i].Node()
 	}
diff --git a/swarm/network/types.go b/swarm/network/network.go
similarity index 100%
rename from swarm/network/types.go
rename to swarm/network/network.go