cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #595 from ipfs/fix/libp2p

Browse Source 
Fix tests with latest libp2p
This commit is contained in:
Hector Sanjuan 2018-10-26 14:02:53 +02:00 committed by GitHub
commit 53a16fba8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/rest/client/client_test.go
View File

@ -10,6 +10,7 @@ import (
"github.com/ipfs/ipfs-cluster/test" "github.com/ipfs/ipfs-cluster/test"
libp2p "github.com/libp2p/go-libp2p" libp2p "github.com/libp2p/go-libp2p"
peer "github.com/libp2p/go-libp2p-peer"
pnet "github.com/libp2p/go-libp2p-pnet" pnet "github.com/libp2p/go-libp2p-pnet"
ma "github.com/multiformats/go-multiaddr" ma "github.com/multiformats/go-multiaddr"
) )
@ -59,9 +60,13 @@ func apiMAddr(a *rest.API) ma.Multiaddr {
} }
func peerMAddr(a *rest.API) ma.Multiaddr { func peerMAddr(a *rest.API) ma.Multiaddr {
listenAddr := a.Host().Addrs()[0] ipfsAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ipfs/%s", peer.IDB58Encode(a.Host().ID())))
ipfsAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ipfs/%s", a.Host().ID().Pretty())) for _, a := range a.Host().Addrs() {
return listenAddr.Encapsulate(ipfsAddr) if _, err := a.ValueForProtocol(ma.P_IP4); err == nil {
return a.Encapsulate(ipfsAddr)
}
}
return nil
} }
func testClientHTTP(t *testing.T, api *rest.API) *defaultClient { func testClientHTTP(t *testing.T, api *rest.API) *defaultClient {
@ -87,7 +92,6 @@ func testClientLibp2p(t *testing.T, api *rest.API) *defaultClient {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
return c.(*defaultClient) return c.(*defaultClient)
} }

14
consensus/raft/consensus_test.go
View File

@ -15,22 +15,12 @@ import (
libp2p "github.com/libp2p/go-libp2p" libp2p "github.com/libp2p/go-libp2p"
host "github.com/libp2p/go-libp2p-host" host "github.com/libp2p/go-libp2p-host"
peerstore "github.com/libp2p/go-libp2p-peerstore" peerstore "github.com/libp2p/go-libp2p-peerstore"
ma "github.com/multiformats/go-multiaddr"
) )
func cleanRaft(idn int) { func cleanRaft(idn int) {
os.RemoveAll(fmt.Sprintf("raftFolderFromTests-%d", idn)) os.RemoveAll(fmt.Sprintf("raftFolderFromTests-%d", idn))
} }
func consensusListenAddr(c *Consensus) ma.Multiaddr {
return c.host.Addrs()[0]
}
func consensusAddr(c *Consensus) ma.Multiaddr {
cAddr, _ := ma.NewMultiaddr(fmt.Sprintf("%s/ipfs/%s", consensusListenAddr(c), c.host.ID().Pretty()))
return cAddr
}
func testPin(c cid.Cid) api.Pin { func testPin(c cid.Cid) api.Pin {
p := api.PinCid(c) p := api.PinCid(c)
p.ReplicationFactorMin = -1 p.ReplicationFactorMin = -1
@ -174,7 +164,7 @@ func TestConsensusAddPeer(t *testing.T) {
defer cc.Shutdown() defer cc.Shutdown()
defer cc2.Shutdown() defer cc2.Shutdown()
cc.host.Peerstore().AddAddr(cc2.host.ID(), consensusListenAddr(cc2), peerstore.PermanentAddrTTL) cc.host.Peerstore().AddAddrs(cc2.host.ID(), cc2.host.Addrs(), peerstore.PermanentAddrTTL)
err := cc.AddPeer(cc2.host.ID()) err := cc.AddPeer(cc2.host.ID())
if err != nil { if err != nil {
t.Error("the operation did not make it to the log:", err) t.Error("the operation did not make it to the log:", err)
@ -205,7 +195,7 @@ func TestConsensusRmPeer(t *testing.T) {
defer cc.Shutdown() defer cc.Shutdown()
defer cc2.Shutdown() defer cc2.Shutdown()
cc.host.Peerstore().AddAddr(cc2.host.ID(), consensusListenAddr(cc2), peerstore.PermanentAddrTTL) cc.host.Peerstore().AddAddrs(cc2.host.ID(), cc2.host.Addrs(), peerstore.PermanentAddrTTL)
err := cc.AddPeer(cc2.host.ID()) err := cc.AddPeer(cc2.host.ID())
if err != nil { if err != nil {

2
ipfscluster_test.go
View File

@ -269,7 +269,7 @@ func createClusters(t *testing.T) ([]*Cluster, []*test.IpfsMock) {
// Start first node // Start first node
clusters[0] = createCluster(t, hosts[0], cfgs[0], raftCons[0], apis[0], ipfss[0], states[0], trackers[0], mons[0], allocs[0], infs[0]) clusters[0] = createCluster(t, hosts[0], cfgs[0], raftCons[0], apis[0], ipfss[0], states[0], trackers[0], mons[0], allocs[0], infs[0])
<-clusters[0].Ready() <-clusters[0].Ready()
bootstrapAddr, _ := ma.NewMultiaddr(fmt.Sprintf("%s/ipfs/%s", clusters[0].host.Addrs()[0], clusters[0].id.Pretty())) bootstrapAddr := clusterAddr(clusters[0])
// Start the rest and join // Start the rest and join
for i := 1; i < nClusters; i++ { for i := 1; i < nClusters; i++ {

10
peer_manager_test.go
View File

@ -50,8 +50,14 @@ func peerManagerClusters(t *testing.T) ([]*Cluster, []*test.IpfsMock) {
} }
func clusterAddr(c *Cluster) ma.Multiaddr { func clusterAddr(c *Cluster) ma.Multiaddr {
cAddr, _ := ma.NewMultiaddr(fmt.Sprintf("%s/ipfs/%s", c.host.Addrs()[0], c.id.Pretty())) for _, a := range c.host.Addrs() {
return cAddr if _, err := a.ValueForProtocol(ma.P_IP4); err == nil {
p := peer.IDB58Encode(c.id)
cAddr, _ := ma.NewMultiaddr(fmt.Sprintf("%s/ipfs/%s", a, p))
return cAddr
}
}
return nil
} }
func TestClustersPeerAdd(t *testing.T) { func TestClustersPeerAdd(t *testing.T) {