From 44bab585a5a79ff8f7a084996dcb012f6cd600a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 11 Sep 2018 13:36:55 +0200
Subject: [PATCH] coreapi swarm: swarm refactor fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
---
 core/coreapi/swarm.go | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/coreapi/swarm.go b/core/coreapi/swarm.go
index 3a9ffcf36..bc208e26a 100644
--- a/core/coreapi/swarm.go
+++ b/core/coreapi/swarm.go
@@ -34,13 +34,11 @@ func (api *SwarmAPI) Connect(ctx context.Context, addr ma.Multiaddr) error {
 		return coreiface.ErrOffline
 	}
 
-	snet, ok := api.node.PeerHost.Network().(*swarm.Network)
+	swrm, ok := api.node.PeerHost.Network().(*swarm.Swarm)
 	if !ok {
 		return fmt.Errorf("peerhost network was not swarm")
 	}
 
-	swrm := snet.Swarm()
-
 	ia, err := iaddr.ParseMultiaddr(ma.Multiaddr(addr))
 	if err != nil {
 		return err
@@ -109,10 +107,13 @@ func (api *SwarmAPI) Peers(context.Context) ([]coreiface.PeerInfo, error) {
 			peer: pid,
 		}
 
-		swcon, ok := c.(*swarm.Conn)
-		if ok {
-			ci.muxer = fmt.Sprintf("%T", swcon.StreamConn().Conn())
-		}
+		/*
+			// FIXME(steb):
+			swcon, ok := c.(*swarm.Conn)
+			if ok {
+				ci.muxer = fmt.Sprintf("%T", swcon.StreamConn().Conn())
+			}
+		*/
 
 		out = append(out, ci)
 	}
@@ -133,10 +134,7 @@ func (ci *connInfo) Latency(context.Context) (time.Duration, error) {
 }
 
 func (ci *connInfo) Streams(context.Context) ([]string, error) {
-	streams, err := ci.conn.GetStreams()
-	if err != nil {
-		return nil, err
-	}
+	streams := ci.conn.GetStreams()
 
 	out := make([]string, len(streams))
 	for i, s := range streams {