Refactor: s/Basic/Direct/ on connection type

cmd/syncthing/connections.go

@@ -290,7 +290,7 @@ func (s *connectionSvc) connect() {
 				}
 
 				s.conns <- model.IntermediateConnection{
-					conn, model.ConnectionTypeBasicDial,
+					conn, model.ConnectionTypeDirectDial,
 				}
 				continue nextDevice
 			}

cmd/syncthing/connections_tcp.go

@@ -99,7 +99,7 @@ func tcpListener(uri *url.URL, tlsCfg *tls.Config, conns chan<- model.Intermedia
 		}
 
 		conns <- model.IntermediateConnection{
-			tc, model.ConnectionTypeBasicAccept,
+			tc, model.ConnectionTypeDirectAccept,
 		}
 	}
 }

lib/model/connection.go

@@ -25,8 +25,8 @@ type Connection struct {
 }
 
 const (
-	ConnectionTypeBasicAccept ConnectionType = iota
+	ConnectionTypeDirectAccept ConnectionType = iota
-	ConnectionTypeBasicDial
+	ConnectionTypeDirectDial
 	ConnectionTypeRelayAccept
 	ConnectionTypeRelayDial
 )
@@ -35,10 +35,10 @@ type ConnectionType int
 
 func (t ConnectionType) String() string {
 	switch t {
-	case ConnectionTypeBasicAccept:
+	case ConnectionTypeDirectAccept:
-		return "basic-accept"
+		return "direct-accept"
-	case ConnectionTypeBasicDial:
+	case ConnectionTypeDirectDial:
-		return "basic-dial"
+		return "direct-dial"
 	case ConnectionTypeRelayAccept:
 		return "relay-accept"
 	case ConnectionTypeRelayDial:
@@ -48,5 +48,5 @@ func (t ConnectionType) String() string {
 }
 
 func (t ConnectionType) IsDirect() bool {
-	return t == ConnectionTypeBasicAccept || t == ConnectionTypeBasicDial
+	return t == ConnectionTypeDirectAccept || t == ConnectionTypeDirectDial
 }

lib/model/model_test.go

@@ -285,7 +285,7 @@ func BenchmarkRequest(b *testing.B) {
 	m.AddConnection(Connection{
 		&net.TCPConn{},
 		fc,
-		ConnectionTypeBasicAccept,
+		ConnectionTypeDirectAccept,
 	})
 	m.Index(device1, "default", files, 0, nil)
 
@@ -328,7 +328,7 @@ func TestDeviceRename(t *testing.T) {
 	m.AddConnection(Connection{
 		&net.TCPConn{},
 		fc,
-		ConnectionTypeBasicAccept,
+		ConnectionTypeDirectAccept,
 	})
 
 	m.ServeBackground()