opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-29 17:36:38 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2199 from ipfs/feat/multi-multiaddr-bootstrap

Browse Source 
combine multiple bootstrap addrs into single peer info
This commit is contained in:
Juan Benet
2016-01-14 20:09:24 -05:00
parent 38a600b3c8 1649b44ae0
commit a28e02be96
2 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/bootstrap.go
View File

@ -203,10 +203,22 @@ func bootstrapConnect(ctx context.Context, ph host.Host, peers []peer.PeerInfo)
}
func toPeerInfos(bpeers []config.BootstrapPeer) []peer.PeerInfo {
var peers []peer.PeerInfo
pinfos := make(map[peer.ID]*peer.PeerInfo)
for _, bootstrap := range bpeers {
peers = append(peers, toPeerInfo(bootstrap))
pinfo, ok := pinfos[bootstrap.ID()]
if !ok {
pinfo = new(peer.PeerInfo)
pinfos[bootstrap.ID()] = pinfo
pinfo.ID = bootstrap.ID()
}
pinfo.Addrs = append(pinfo.Addrs, bootstrap.Multiaddr())
}
var peers []peer.PeerInfo
for _, pinfo := range pinfos {
peers = append(peers, *pinfo)
}
return peers
}

31
core/bootstrap_test.go
View File

@ -1,9 +1,11 @@
package core
import (
"fmt"
"testing"
peer "github.com/ipfs/go-ipfs/p2p/peer"
config "github.com/ipfs/go-ipfs/repo/config"
testutil "github.com/ipfs/go-ipfs/util/testutil"
)
@ -23,3 +25,32 @@ func TestSubsetWhenMaxIsGreaterThanLengthOfSlice(t *testing.T) {
t.Fail()
}
}
func TestMultipleAddrsPerPeer(t *testing.T) {
var bsps []config.BootstrapPeer
for i := 0; i < 10; i++ {
pid, err := testutil.RandPeerID()
if err != nil {
t.Fatal(err)
}
addr := fmt.Sprintf("/ip4/127.0.0.1/tcp/5001/ipfs/%s", pid.Pretty())
bsp1, err := config.ParseBootstrapPeer(addr)
if err != nil {
t.Fatal(err)
}
addr = fmt.Sprintf("/ip4/127.0.0.1/udp/5002/utp/ipfs/%s", pid.Pretty())
bsp2, err := config.ParseBootstrapPeer(addr)
if err != nil {
t.Fatal(err)
}
bsps = append(bsps, bsp1, bsp2)
}
pinfos := toPeerInfos(bsps)
if len(pinfos) != len(bsps)/2 {
t.Fatal("expected fewer peers")
}
}