coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-11 19:27:51 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

coreapi swarm: swarm refactor fixes

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera 2018-09-11 13:36:55 +02:00
parent e7f493b569
commit 44bab585a5
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/coreapi/swarm.go
View File

@ -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 {