And more tests

pkg/app2/network/dmsg_conn.go

@@ -0,0 +1,64 @@
+package network
+
+import (
+	"net"
+	"time"
+
+	"github.com/skycoin/skywire/pkg/routing"
+
+	"github.com/skycoin/dmsg"
+)
+
+type DMSGConn struct {
+	tp *dmsg.Transport
+}
+
+func (c *DMSGConn) Read(b []byte) (n int, err error) {
+	return c.tp.Read(b)
+}
+
+func (c *DMSGConn) Write(b []byte) (n int, err error) {
+	return c.tp.Write(b)
+}
+
+func (c *DMSGConn) Close() error {
+	return c.tp.Close()
+}
+
+func (c *DMSGConn) LocalAddr() net.Addr {
+	dmsgAddr, ok := c.tp.LocalAddr().(dmsg.Addr)
+	if !ok {
+		return c.tp.LocalAddr()
+	}
+
+	return Addr{
+		Net:    TypeDMSG,
+		PubKey: dmsgAddr.PK,
+		Port:   routing.Port(dmsgAddr.Port),
+	}
+}
+
+func (c *DMSGConn) RemoteAddr() net.Addr {
+	dmsgAddr, ok := c.tp.RemoteAddr().(dmsg.Addr)
+	if !ok {
+		return c.tp.RemoteAddr()
+	}
+
+	return Addr{
+		Net:    TypeDMSG,
+		PubKey: dmsgAddr.PK,
+		Port:   routing.Port(dmsgAddr.Port),
+	}
+}
+
+func (c *DMSGConn) SetDeadline(t time.Time) error {
+	return c.tp.SetDeadline(t)
+}
+
+func (c *DMSGConn) SetReadDeadline(t time.Time) error {
+	return c.tp.SetReadDeadline(t)
+}
+
+func (c *DMSGConn) SetWriteDeadline(t time.Time) error {
+	return c.tp.SetWriteDeadline(t)
+}

pkg/app2/network/dmsg_networker.go

@@ -26,7 +26,12 @@ func (n *DMSGNetworker) Dial(addr Addr) (net.Conn, error) {
 
 // DialContext dials remote `addr` via dmsg network with context.
 func (n *DMSGNetworker) DialContext(ctx context.Context, addr Addr) (net.Conn, error) {
-	return n.dmsgC.Dial(ctx, addr.PubKey, uint16(addr.Port))
+	tp, err := n.dmsgC.Dial(ctx, addr.PubKey, uint16(addr.Port))
+	if err != nil {
+		return nil, err
+	}
+
+	return &DMSGConn{tp: tp}, nil
 }
 
 // Listen starts listening on local `addr` in the dmsg network.

pkg/app2/network/networker.go

@@ -47,6 +47,14 @@ func ResolveNetworker(t Type) (Networker, error) {
 	return n, nil
 }
 
+// ClearNetworkers removes all the stored networkers.
+func ClearNetworkers() {
+	networkersMx.Lock()
+	defer networkersMx.Unlock()
+
+	networkers = make(map[Type]Networker)
+}
+
 // Networker defines basic network operations, such as Dial/Listen.
 type Networker interface {
 	Dial(addr Addr) (net.Conn, error)

pkg/app2/network/networker_test.go

@@ -5,15 +5,14 @@ import (
 	"net"
 	"testing"
 
-	"github.com/skycoin/skywire/pkg/routing"
-
 	"github.com/skycoin/dmsg/cipher"
-
 	"github.com/stretchr/testify/require"
+
+	"github.com/skycoin/skywire/pkg/routing"
 )
 
 func TestAddNetworker(t *testing.T) {
-	clearNetworkers()
+	ClearNetworkers()
 
 	nType := TypeDMSG
 	var n Networker
@@ -26,7 +25,7 @@ func TestAddNetworker(t *testing.T) {
 }
 
 func TestResolveNetworker(t *testing.T) {
-	clearNetworkers()
+	ClearNetworkers()
 
 	nType := TypeDMSG
 	var n Networker
@@ -46,14 +45,14 @@ func TestDial(t *testing.T) {
 	addr := prepAddr()
 
 	t.Run("no such networker", func(t *testing.T) {
-		clearNetworkers()
+		ClearNetworkers()
 
 		_, err := Dial(addr)
 		require.Equal(t, err, ErrNoSuchNetworker)
 	})
 
 	t.Run("ok", func(t *testing.T) {
-		clearNetworkers()
+		ClearNetworkers()
 
 		dialCtx := context.Background()
 		var (
@@ -77,14 +76,14 @@ func TestListen(t *testing.T) {
 	addr := prepAddr()
 
 	t.Run("no such networker", func(t *testing.T) {
-		clearNetworkers()
+		ClearNetworkers()
 
 		_, err := Listen(addr)
 		require.Equal(t, err, ErrNoSuchNetworker)
 	})
 
 	t.Run("ok", func(t *testing.T) {
-		clearNetworkers()
+		ClearNetworkers()
 
 		listenCtx := context.Background()
 		var (
@@ -114,10 +113,3 @@ func prepAddr() Addr {
 		Port:   addrPort,
 	}
 }
-
-func clearNetworkers() {
-	networkersMx.Lock()
-	defer networkersMx.Unlock()
-
-	networkers = make(map[Type]Networker)
-}