Feature/remove redialing

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

@@ -58,13 +58,13 @@ var discTpCmd = &cobra.Command{
 	},
 }
 
-func printTransportEntries(entries ...*transport.EntryWithStatus) {
+func printTransportEntries(entries ...*transport.Entry) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 5, ' ', tabwriter.TabIndent)
-	_, err := fmt.Fprintln(w, "id\ttype\tpublic\tregistered\tup\tedge1\tedge2\topinion1\topinion2")
+	_, err := fmt.Fprintln(w, "id\ttype\tedge1\tedge2")
 	internal.Catch(err)
 	for _, e := range entries {
-		_, err := fmt.Fprintf(w, "%s\t%s\t%t\t%d\t%t\t%s\t%s\t%t\t%t\n",
-			e.Entry.ID, e.Entry.Type, e.Entry.Public, e.Registered, e.IsUp, e.Entry.Edges[0], e.Entry.Edges[1], e.Statuses[0], e.Statuses[1])
+		_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n",
+			e.ID, e.Type, e.Edges[0], e.Edges[1])
 		internal.Catch(err)
 	}
 	internal.Catch(w.Flush())

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/router/router.go

@@ -317,8 +317,6 @@ func (r *router) Serve(ctx context.Context) error {
 
 	go r.serveSetup()
 
-	r.tm.Serve(ctx)
-
 	return nil
 }
 
@@ -728,17 +726,16 @@ func (r *router) Close() error {
 
 	r.once.Do(func() {
 		close(r.done)
-
 		r.mx.Lock()
 		close(r.accept)
 		r.mx.Unlock()
 	})
-
 	if err := r.sl.Close(); err != nil {
 		r.logger.WithError(err).Warnf("closing route_manager returned error")
+		return err
 	}
 
-	return r.tm.Close()
+	return nil
 }
 
 func (r *router) forwardPacket(ctx context.Context, packet routing.Packet, rule routing.Rule) error {

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/deprecated/deprecated.go

@@ -0,0 +1,17 @@
+package deprecated
+
+import (
+	"github.com/google/uuid"
+)
+
+// Status represents the current state of a Transport from a Transport's single edge.
+// Each Transport will have two perspectives; one from each of it's edges.
+type Status struct {
+
+	// ID is the Transport ID that identifies the Transport that this status is regarding.
+	ID uuid.UUID `json:"t_id"`
+
+	// IsUp represents whether the Transport is up.
+	// A Transport that is down will fail to forward Packets.
+	IsUp bool `json:"is_up"`
+}

pkg/transport/discovery.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"sync"
-	"time"
 
 	"github.com/google/uuid"
 	"github.com/skycoin/dmsg/cipher"
@@ -15,41 +14,34 @@ import (
 // DiscoveryClient performs Transport discovery operations.
 type DiscoveryClient interface {
 	RegisterTransports(ctx context.Context, entries ...*SignedEntry) error
-	GetTransportByID(ctx context.Context, id uuid.UUID) (*EntryWithStatus, error)
-	GetTransportsByEdge(ctx context.Context, pk cipher.PubKey) ([]*EntryWithStatus, error)
+	GetTransportByID(ctx context.Context, id uuid.UUID) (*Entry, error)
+	GetTransportsByEdge(ctx context.Context, pk cipher.PubKey) ([]*Entry, error)
 	DeleteTransport(ctx context.Context, id uuid.UUID) error
-	UpdateStatuses(ctx context.Context, statuses ...*Status) ([]*EntryWithStatus, error)
+	HeartBeat(ctx context.Context, id uuid.UUID) error
 	Health(ctx context.Context) (int, error)
 }
 
 type mockDiscoveryClient struct {
 	sync.Mutex
-	entries map[uuid.UUID]EntryWithStatus
+	entries map[uuid.UUID]Entry
 }
 
 // NewDiscoveryMock construct a new mock transport discovery client.
 func NewDiscoveryMock() DiscoveryClient {
-	return &mockDiscoveryClient{entries: map[uuid.UUID]EntryWithStatus{}}
+	return &mockDiscoveryClient{entries: map[uuid.UUID]Entry{}}
 }
 
 func (td *mockDiscoveryClient) RegisterTransports(ctx context.Context, entries ...*SignedEntry) error {
 	td.Lock()
 	for _, entry := range entries {
-		entryWithStatus := &EntryWithStatus{
-			Entry:      entry.Entry,
-			IsUp:       true,
-			Registered: time.Now().Unix(),
-			Statuses:   [2]bool{true, true},
-		}
-		td.entries[entry.Entry.ID] = *entryWithStatus
-		entry.Registered = entryWithStatus.Registered
+		td.entries[entry.Entry.ID] = *entry.Entry
 	}
 	td.Unlock()
 
 	return nil
 }
 
-func (td *mockDiscoveryClient) GetTransportByID(ctx context.Context, id uuid.UUID) (*EntryWithStatus, error) {
+func (td *mockDiscoveryClient) GetTransportByID(ctx context.Context, id uuid.UUID) (*Entry, error) {
 	td.Lock()
 	entry, ok := td.entries[id]
 	td.Unlock()
@@ -58,20 +50,20 @@ func (td *mockDiscoveryClient) GetTransportByID(ctx context.Context, id uuid.UUI
 		return nil, errors.New("transport not found")
 	}
 
-	return &EntryWithStatus{
-		Entry:      entry.Entry,
-		IsUp:       entry.IsUp,
-		Registered: entry.Registered,
-		Statuses:   entry.Statuses,
+	return &Entry{
+		ID:    entry.ID,
+		Edges: entry.Edges,
+		Label: entry.Label,
+		Type:  entry.Type,
 	}, nil
 }
 
-func (td *mockDiscoveryClient) GetTransportsByEdge(ctx context.Context, pk cipher.PubKey) ([]*EntryWithStatus, error) {
+func (td *mockDiscoveryClient) GetTransportsByEdge(ctx context.Context, pk cipher.PubKey) ([]*Entry, error) {
 	td.Lock()
-	res := make([]*EntryWithStatus, 0)
+	res := make([]*Entry, 0)
 	for _, entry := range td.entries {
-		if entry.Entry.HasEdge(pk) {
-			e := &EntryWithStatus{}
+		if entry.HasEdge(pk) {
+			e := &Entry{}
 			*e = entry
 			res = append(res, e)
 		}
@@ -100,24 +92,10 @@ func (td *mockDiscoveryClient) DeleteTransport(ctx context.Context, id uuid.UUID
 	return nil
 }
 
-func (td *mockDiscoveryClient) UpdateStatuses(ctx context.Context, statuses ...*Status) ([]*EntryWithStatus, error) {
-	res := make([]*EntryWithStatus, 0)
-
-	for _, status := range statuses {
-		entry, err := td.GetTransportByID(ctx, status.ID)
-		if err != nil {
-			return nil, err
-		}
-
-		td.Lock()
-		entry.IsUp = status.IsUp
-		td.entries[status.ID] = *entry
-		td.Unlock()
-	}
-
-	return res, nil
-}
-
 func (td *mockDiscoveryClient) Health(_ context.Context) (int, error) {
 	return http.StatusOK, nil
 }
+
+func (td *mockDiscoveryClient) HeartBeat(_ context.Context, _ uuid.UUID) error {
+	return nil
+}

pkg/transport/discovery_test.go

@@ -22,12 +22,9 @@ func TestNewDiscoveryMock(t *testing.T) {
 
 	entryWS, err := dc.GetTransportByID(context.TODO(), sEntry.Entry.ID)
 	require.NoError(t, err)
-	require.True(t, entryWS.Entry.ID == sEntry.Entry.ID)
+	require.True(t, entryWS.ID == sEntry.Entry.ID)
 
 	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)
+	require.Equal(t, entry.Edges, entriesWS[0].Edges)
 }

pkg/transport/entry.go

@@ -3,7 +3,6 @@ package transport
 import (
 	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/google/uuid"
 	"github.com/skycoin/dmsg/cipher"
@@ -36,29 +35,23 @@ 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.
 	Type network.Type `json:"type"`
 
-	// Public determines whether the transport is to be exposed to other nodes or not.
-	// Public transports are to be registered in the Transport Discovery.
-	Public bool `json:"public"` // TODO(evanlinjin): remove this.
-
 	Label Label `json:"label"`
 }
 
 // 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, label Label) Entry {
 	entry := Entry{
-		ID:     MakeTransportID(initiator, target, netType),
-		Type:   netType,
-		Public: public,
-		Label:  label,
+		ID:    MakeTransportID(aPK, bPK, netType),
+		Type:  netType,
+		Label: label,
+		Edges: SortEdges(aPK, bPK),
 	}
-	entry.Edges[0] = initiator
-	entry.Edges[1] = target
 	return entry
 }
 
@@ -84,6 +77,12 @@ func (e *Entry) EdgeIndex(pk cipher.PubKey) int {
 	return -1
 }
 
+// IsLeastSignificantEdge returns true if given pk is least significant edge
+// of this entry
+func (e *Entry) IsLeastSignificantEdge(pk cipher.PubKey) bool {
+	return e.EdgeIndex(pk) == 0
+}
+
 // HasEdge returns true if the provided edge is present in 'e.Edges' field.
 func (e *Entry) HasEdge(edge cipher.PubKey) bool {
 	for _, pk := range e.Edges {
@@ -97,16 +96,11 @@ func (e *Entry) HasEdge(edge cipher.PubKey) bool {
 // String implements stringer
 func (e *Entry) String() string {
 	res := ""
-	if e.Public {
-		res += "visibility: public\n"
-	} else {
-		res += "visibility: private\n"
-	}
 	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
 }
 
@@ -170,41 +164,3 @@ func NewSignedEntry(entry *Entry, pk cipher.PubKey, secKey cipher.SecKey) (*Sign
 	se := &SignedEntry{Entry: entry}
 	return se, se.Sign(pk, secKey)
 }
-
-// Status represents the current state of a Transport from a Transport's single edge.
-// Each Transport will have two perspectives; one from each of it's edges.
-type Status struct {
-
-	// ID is the Transport ID that identifies the Transport that this status is regarding.
-	ID uuid.UUID `json:"t_id"`
-
-	// IsUp represents whether the Transport is up.
-	// A Transport that is down will fail to forward Packets.
-	IsUp bool `json:"is_up"`
-}
-
-// EntryWithStatus stores Entry and Statuses returned by both Edges.
-type EntryWithStatus struct {
-	Entry      *Entry  `json:"entry"`
-	IsUp       bool    `json:"is_up"`
-	Registered int64   `json:"registered"`
-	Updated    int64   `json:"updated"`
-	Statuses   [2]bool `json:"statuses"`
-}
-
-// String implements stringer
-func (e *EntryWithStatus) String() string {
-	res := "entry:\n"
-	res += fmt.Sprintf("\tregistered at: %d\n", e.Registered)
-	res += fmt.Sprintf("\tstatus returned by edge 1: %t\n", e.Statuses[0])
-	res += fmt.Sprintf("\tstatus returned by edge 2: %t\n", e.Statuses[1])
-	if e.IsUp {
-		res += "\ttransport: up\n"
-	} else {
-		res += "\ttransport: down\n"
-	}
-	indentedStr := strings.Replace(e.Entry.String(), "\n\t", "\n\t\t", -1)
-	res += fmt.Sprintf("\ttransport info: \n\t\t%s", indentedStr)
-
-	return res
-}