swarm/network: hive SuggestPeer unit tests

cmd/swarm/run_test.go

@@ -36,17 +36,22 @@ import (
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/internal/cmdtest"
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/ethereum/go-ethereum/swarm"
 	"github.com/ethereum/go-ethereum/swarm/api"
 	swarmhttp "github.com/ethereum/go-ethereum/swarm/api/http"
+	colorable "github.com/mattn/go-colorable"
 )
 
 var loglevel = flag.Int("loglevel", 3, "verbosity of logs")
 
 func init() {
+	log.PrintOrigins(true)
+	log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(*loglevel), log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true))))
+
 	// Run the app if we've been exec'd as "swarm-test" in runSwarm.
 	reexec.Register("swarm-test", func() {
 		if err := app.Run(os.Args); err != nil {

cmd/swarm/upload_test.go

@@ -33,14 +33,8 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	swarmapi "github.com/ethereum/go-ethereum/swarm/api/client"
 	"github.com/ethereum/go-ethereum/swarm/testutil"
-	"github.com/mattn/go-colorable"
 )
 
-func init() {
-	log.PrintOrigins(true)
-	log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(*loglevel), log.StreamHandler(colorable.NewColorableStderr(), log.TerminalFormat(true))))
-}
-
 func TestSwarmUp(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		t.Skip()

swarm/network/discovery.go

@@ -57,8 +57,9 @@ func NewPeer(p *BzzPeer, kad *Kademlia) *Peer {
 		exchange: &exchange{
 			peers: make(map[string]bool),
 		},
-		kad:     kad,
-		BzzPeer: p,
+		kad:          kad,
+		BzzPeer:      p,
+		connectivity: &connectivity{seenAt: time.Now()},
 	}
 	// record remote as seen so we never send a peer its own record
 	d.seen(p.BzzAddr)