From caa651aaecf38f84f02731b7585dcc39552a7c22 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Wed, 7 Jan 2015 18:35:10 +0000
Subject: [PATCH 1/2] Info log message for connected peers

---
 p2p/server.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/p2p/server.go b/p2p/server.go
index a9d1d3989b..4717b895d7 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -167,7 +167,7 @@ func (srv *Server) dialPeer(peer *Peer) (err error) {
 	case <-timeout:
 		err = fmt.Errorf("Too many connections. No slot available")
 	case slot := <-srv.peerSlots: // there is a slot available
-		srvlog.Debugf("Dialing %v (slot %d)\n", peer.dialAddr, slot)
+		srvlog.Infof("Dialing %v (slot %d)\n", peer.dialAddr, slot)
 		conn, dialErr := srv.Dialer.Dial(peer.dialAddr.Network(), peer.dialAddr.String())
 		if dialErr != nil {
 			err = fmt.Errorf("Dial error: %v", dialErr)
@@ -175,7 +175,7 @@ func (srv *Server) dialPeer(peer *Peer) (err error) {
 			srv.peerSlots <- slot
 			return
 		}
-		srvlog.Debugf("Connected to %v (slot %d)\n", peer.dialAddr, slot)
+		srvlog.Infof("Connected to %v (slot %d)\n", peer.dialAddr, slot)
 		peer.slot = slot
 		srv.connectFunc(peer, conn)
 		go srv.addPeer(peer)

From 13ca81544b8530dff8f9a541251928f0c43e6783 Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Wed, 7 Jan 2015 18:49:57 +0000
Subject: [PATCH 2/2] NoDial option now effective within AddPeer -> returns
 error

---
 p2p/server.go | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/p2p/server.go b/p2p/server.go
index 4717b895d7..73583b7090 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -60,6 +60,8 @@ type Server struct {
 	Dialer *net.Dialer
 
 	// If NoDial is true, the server will not dial any peers.
+	// this maybe used in test environments where we want to prevent a node from
+	// connecting (and synchronising) with other nodes
 	NoDial bool
 
 	// peer selector
@@ -144,9 +146,10 @@ func (srv *Server) SuggestPeer(addr string, pubkey []byte) error {
 // If not found among connected peers turns to the peerSelector
 // to decide if it is a worthwhile connection
 func (srv *Server) AddPeer(addr *peerAddr) (err error) {
+	if srv.NoDial {
+		return fmt.Errorln("no dial out")
+	}
 	// need to look up nodeID first
-	srvlog.Infof("checking peer %v", addr)
-
 	peer := &Peer{
 		dialAddr:    addr,
 		lastActiveC: make(chan time.Time),
@@ -256,13 +259,6 @@ func (srv *Server) Start() (err error) {
 			return err
 		}
 	}
-	// if !srv.NoDial {
-	// 	srv.wg.Add(1)
-	// 	go srv.dialLoop()
-	// }
-	if srv.NoDial && srv.ListenAddr == "" {
-		srvlog.Warnln("I will be kind-of useless, neither dialing nor listening.")
-	}
 
 	if srv.PeerSelector == nil {
 		srv.PeerSelector = &BaseSelector{}