@cryptotaxi247 / kubo / commits / d6f442bb8

refactor(as-a-library): replace deprecated functions and structures

lasiar committed Jul 17, 2021 at 03:22 UTC d6f442bb86d3429ebea7dce163b82a676bf4d289
1 file changed +4 -5
docs/examples/go-ipfs-as-a-library/main.go
+4 -5
@@ -15,7 +15,6 @@ import (
15 libp2p "github.com/ipfs/go-ipfs/core/node/libp2p"
16 icore "github.com/ipfs/interface-go-ipfs-core"
17 icorepath "github.com/ipfs/interface-go-ipfs-core/path"
18 - peerstore "github.com/libp2p/go-libp2p-peerstore"
18 ma "github.com/multiformats/go-multiaddr"
19
20 "github.com/ipfs/go-ipfs/core"
@@ -131,19 +130,19 @@ func spawnEphemeral(ctx context.Context) (icore.CoreAPI, error) {
130
131 func connectToPeers(ctx context.Context, ipfs icore.CoreAPI, peers []string) error {
132 var wg sync.WaitGroup
134 - peerInfos := make(map[peer.ID]*peerstore.PeerInfo, len(peers))
133 + peerInfos := make(map[peer.ID]*peer.AddrInfo, len(peers))
134 for _, addrStr := range peers {
135 addr, err := ma.NewMultiaddr(addrStr)
136 if err != nil {
137 return err
138 }
140 - pii, err := peerstore.InfoFromP2pAddr(addr)
139 + pii, err := peer.AddrInfoFromP2pAddr(addr)
140 if err != nil {
141 return err
142 }
143 pi, ok := peerInfos[pii.ID]
144 if !ok {
146 - pi = &peerstore.PeerInfo{ID: pii.ID}
145 + pi = &peer.AddrInfo{ID: pii.ID}
146 peerInfos[pi.ID] = pi
147 }
148 pi.Addrs = append(pi.Addrs, pii.Addrs...)
@@ -151,7 +150,7 @@ func connectToPeers(ctx context.Context, ipfs icore.CoreAPI, peers []string) err
150
151 wg.Add(len(peerInfos))
152 for _, peerInfo := range peerInfos {
154 - go func(peerInfo *peerstore.PeerInfo) {
153 + go func(peerInfo *peer.AddrInfo) {
154 defer wg.Done()
155 err := ipfs.Swarm().Connect(ctx, *peerInfo)
156 if err != nil {