swarm: always append peer IDs
This commit was moved from ipfs/go-ipfs-http-client@49267901c71f77f098deaf8966aa2dcecf22c2df
Łukasz Magiera committed
Feb 18, 2019 at 17:30 UTC
3088776f8150fe6967a245cf0360f5219e2dc9b6
1 file changed
+6
-8
client/httpapi/swarm.go
+6
-8
@@ -15,16 +15,14 @@ import (
15
type SwarmAPI HttpApi
16
17
func (api *SwarmAPI) Connect(ctx context.Context, pi peerstore.PeerInfo) error {
18
+ pidma, err := multiaddr.NewComponent("p2p", pi.ID.Pretty())
19
+ if err != nil {
20
+ return err
21
+ }
22
+
23
saddrs := make([]string, len(pi.Addrs))
24
for i, addr := range pi.Addrs {
20
- if _, err := addr.ValueForProtocol(multiaddr.P_P2P); err == multiaddr.ErrProtocolNotFound {
21
- pidma, err := multiaddr.NewComponent("p2p", pi.ID.Pretty())
22
- if err != nil {
23
- return err
24
- }
25
- addr = addr.Encapsulate(pidma)
26
- }
27
- saddrs[i] = addr.String()
25
+ saddrs[i] = addr.Encapsulate(pidma).String()
26
}
27
28
return api.core().request("swarm/connect", saddrs...).Exec(ctx, nil)