Feature/remove redialing

cmd/skywire-cli/commands/visor/transports.go

@@ -106,10 +106,6 @@ var addTpCmd = &cobra.Command{
 				logger.WithError(err).Fatalf("Failed to establish %v transport", transportType)
 			}
 
-			if !tp.IsUp {
-				logger.Fatalf("Established %v transport to %v with ID %v, but it isn't up", transportType, pk, tp.ID)
-			}
-
 			logger.Infof("Established %v transport to %v", transportType, pk)
 		} else {
 			transportTypes := []network.Type{
@@ -148,14 +144,14 @@ var rmTpCmd = &cobra.Command{
 func printTransports(tps ...*visor.TransportSummary) {
 	sortTransports(tps...)
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 5, ' ', tabwriter.TabIndent)
-	_, err := fmt.Fprintln(w, "type\tid\tremote\tmode\tlabel\tis_up")
+	_, err := fmt.Fprintln(w, "type\tid\tremote\tmode\tlabel")
 	internal.Catch(err)
 	for _, tp := range tps {
 		tpMode := "regular"
 		if tp.IsSetup {
 			tpMode = "setup"
 		}
-		_, err = fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%v\n", tp.Type, tp.ID, tp.Remote, tpMode, tp.Label, tp.IsUp)
+		_, err = fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", tp.Type, tp.ID, tp.Remote, tpMode, tp.Label)
 		internal.Catch(err)
 	}
 	internal.Catch(w.Flush())

pkg/servicedisc/autoconnect.go

@@ -55,7 +55,7 @@ func (a *autoconnector) Run(ctx context.Context) error {
 			a.log.Errorf("Cannot fetch public services: %s", err)
 		}
 
-		tps := a.updateTransports()
+		tps := a.tm.GetTransportsByLabel(transport.LabelAutomatic)
 		absent := a.filterDuplicates(addresses, tps)
 		for _, pk := range absent {
 			a.log.WithField("pk", pk).Infoln("Adding transport to public visor")
@@ -69,21 +69,6 @@ func (a *autoconnector) Run(ctx context.Context) error {
 	}
 }
 
-// Remove all inactive automatic transports and return all active
-// automatic transports
-func (a *autoconnector) updateTransports() []*transport.ManagedTransport {
-	tps := a.tm.GetTransportsByLabel(transport.LabelAutomatic)
-	var tpsActive []*transport.ManagedTransport
-	for _, tr := range tps {
-		if !tr.IsUp() {
-			a.tm.DeleteTransport(tr.Entry.ID)
-		} else {
-			tpsActive = append(tpsActive, tr)
-		}
-	}
-	return tpsActive
-}
-
 func (a *autoconnector) fetchPubAddresses(ctx context.Context) ([]cipher.PubKey, error) {
 	retrier := netutil.NewRetrier(fetchServicesDelay, 0, 2)
 	var services []Service

pkg/transport/discovery.go

@@ -18,7 +18,6 @@ type DiscoveryClient interface {
 	GetTransportByID(ctx context.Context, id uuid.UUID) (*EntryWithStatus, error)
 	GetTransportsByEdge(ctx context.Context, pk cipher.PubKey) ([]*EntryWithStatus, error)
 	DeleteTransport(ctx context.Context, id uuid.UUID) error
-	UpdateStatuses(ctx context.Context, statuses ...*Status) ([]*EntryWithStatus, error)
 	Health(ctx context.Context) (int, error)
 }
 

pkg/transport/discovery_test.go

@@ -27,7 +27,4 @@ func TestNewDiscoveryMock(t *testing.T) {
 	entriesWS, err := dc.GetTransportsByEdge(context.TODO(), pk1)
 	require.NoError(t, err)
 	require.Equal(t, entry.Edges, entriesWS[0].Entry.Edges)
-
-	_, err = dc.UpdateStatuses(context.TODO(), &transport.Status{})
-	require.NoError(t, err)
 }

pkg/transport/entry.go

@@ -36,7 +36,7 @@ type Entry struct {
 	ID uuid.UUID `json:"t_id"`
 
 	// Edges contains the public keys of the Transport's edge nodes
-	// (should only have 2 edges and the first edge is transport original initiator).
+	// Edges should always be sorted in ascending order
 	Edges [2]cipher.PubKey `json:"edges"`
 
 	// Type represents the transport type.
@@ -50,15 +50,14 @@ type Entry struct {
 }
 
 // MakeEntry creates a new transport entry
-func MakeEntry(initiator, target cipher.PubKey, netType network.Type, public bool, label Label) Entry {
+func MakeEntry(aPK, bPK cipher.PubKey, netType network.Type, public bool, label Label) Entry {
 	entry := Entry{
-		ID:     MakeTransportID(initiator, target, netType),
+		ID:     MakeTransportID(aPK, bPK, netType),
 		Type:   netType,
 		Public: public,
 		Label:  label,
+		Edges:  SortEdges(aPK, bPK),
 	}
-	entry.Edges[0] = initiator
-	entry.Edges[1] = target
 	return entry
 }
 
@@ -105,8 +104,8 @@ func (e *Entry) String() string {
 	res += fmt.Sprintf("\ttype: %s\n", e.Type)
 	res += fmt.Sprintf("\tid: %s\n", e.ID)
 	res += "\tedges:\n"
-	res += fmt.Sprintf("\t\tedge 1 (initiator): %s\n", e.Edges[0])
-	res += fmt.Sprintf("\t\tedge 2 (target): %s\n", e.Edges[1])
+	res += fmt.Sprintf("\t\tedge 1: %s\n", e.Edges[0])
+	res += fmt.Sprintf("\t\tedge 2: %s\n", e.Edges[1])
 	return res
 }
 

pkg/transport/handshake.go

@@ -23,12 +23,9 @@ const (
 	responseInvalidEntry
 )
 
-func makeEntryFromTpConn(conn network.Conn, isInitiator bool) Entry {
-	initiator, target := conn.LocalPK(), conn.RemotePK()
-	if !isInitiator {
-		initiator, target = target, initiator
-	}
-	return MakeEntry(initiator, target, conn.Network(), true, LabelUser)
+func makeEntryFromTpConn(conn network.Conn) Entry {
+	aPK, bPK := conn.LocalPK(), conn.RemotePK()
+	return MakeEntry(aPK, bPK, conn.Network(), true, LabelUser)
 }
 
 func compareEntries(expected, received *Entry) error {
@@ -99,7 +96,7 @@ func (hs SettlementHS) Do(ctx context.Context, dc DiscoveryClient, conn network.
 func MakeSettlementHS(init bool) SettlementHS {
 	// initiating logic.
 	initHS := func(ctx context.Context, dc DiscoveryClient, conn network.Conn, sk cipher.SecKey) (err error) {
-		entry := makeEntryFromTpConn(conn, true)
+		entry := makeEntryFromTpConn(conn)
 
 		// TODO(evanlinjin): Probably not needed as this is called in mTp already. Need to double check.
 		//defer func() {
@@ -139,7 +136,7 @@ func MakeSettlementHS(init bool) SettlementHS {
 
 	// responding logic.
 	respHS := func(ctx context.Context, dc DiscoveryClient, conn network.Conn, sk cipher.SecKey) error {
-		entry := makeEntryFromTpConn(conn, false)
+		entry := makeEntryFromTpConn(conn)
 
 		// receive, verify and sign entry.
 		recvSE, err := receiveAndVerifyEntry(conn, &entry, conn.RemotePK())