coreapi swarm: swarm refactor fixes
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Sep 11, 2018 at 13:36 UTC
44bab585a5a79ff8f7a084996dcb012f6cd600a7
1 file changed
+9
-11
core/coreapi/swarm.go
+9
-11
@@ -34,13 +34,11 @@ func (api *SwarmAPI) Connect(ctx context.Context, addr ma.Multiaddr) error {
34
return coreiface.ErrOffline
35
}
36
37
- snet, ok := api.node.PeerHost.Network().(*swarm.Network)
37
+ swrm, ok := api.node.PeerHost.Network().(*swarm.Swarm)
38
if !ok {
39
return fmt.Errorf("peerhost network was not swarm")
40
}
41
42
- swrm := snet.Swarm()
43
-
42
ia, err := iaddr.ParseMultiaddr(ma.Multiaddr(addr))
43
if err != nil {
44
return err
@@ -109,10 +107,13 @@ func (api *SwarmAPI) Peers(context.Context) ([]coreiface.PeerInfo, error) {
107
peer: pid,
108
}
109
112
- swcon, ok := c.(*swarm.Conn)
113
- if ok {
114
- ci.muxer = fmt.Sprintf("%T", swcon.StreamConn().Conn())
115
- }
110
+ /*
111
+ // FIXME(steb):
112
+ swcon, ok := c.(*swarm.Conn)
113
+ if ok {
114
+ ci.muxer = fmt.Sprintf("%T", swcon.StreamConn().Conn())
115
+ }
116
+ */
117
118
out = append(out, ci)
119
}
@@ -133,10 +134,7 @@ func (ci *connInfo) Latency(context.Context) (time.Duration, error) {
134
}
135
136
func (ci *connInfo) Streams(context.Context) ([]string, error) {
136
- streams, err := ci.conn.GetStreams()
137
- if err != nil {
138
- return nil, err
139
- }
137
+ streams := ci.conn.GetStreams()
138
139
out := make([]string, len(streams))
140
for i, s := range streams {