Merge pull request #1671 from nspcc-dev/register-connected-fix

network: don't register addresses before version handshake

pkg/network/discovery.go

@@ -192,8 +192,6 @@ func (d *DefaultDiscovery) tryAddress(addr string) {
 	if err := d.transport.Dial(addr, d.dialTimeout); err != nil {
 		d.RegisterBadAddr(addr)
 		d.RequestRemote(1)
-	} else {
-		d.RegisterConnectedAddr(addr)
 	}
 }
 

pkg/network/discovery_test.go

@@ -81,6 +81,7 @@ func TestDefaultDiscoverer(t *testing.T) {
 		select {
 		case a := <-ts.dialCh:
 			dialled = append(dialled, a)
+			d.RegisterConnectedAddr(a)
 		case <-time.After(time.Second):
 			t.Fatalf("timeout expecting for transport dial")
 		}