From 07a66851cba76707af4de602a456469efb554ee4 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 14 Mar 2018 00:01:10 +0100 Subject: [PATCH] consensus/raft: use new host constructor in tests License: MIT Signed-off-by: Hector Sanjuan --- consensus/raft/consensus_test.go | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/consensus/raft/consensus_test.go b/consensus/raft/consensus_test.go index 112339e3..a17c11bb 100644 --- a/consensus/raft/consensus_test.go +++ b/consensus/raft/consensus_test.go @@ -13,12 +13,10 @@ import ( cid "github.com/ipfs/go-cid" logging "github.com/ipfs/go-log" - crypto "github.com/libp2p/go-libp2p-crypto" + libp2p "github.com/libp2p/go-libp2p" host "github.com/libp2p/go-libp2p-host" peer "github.com/libp2p/go-libp2p-peer" peerstore "github.com/libp2p/go-libp2p-peerstore" - swarm "github.com/libp2p/go-libp2p-swarm" - basichost "github.com/libp2p/go-libp2p/p2p/host/basic" ma "github.com/multiformats/go-multiaddr" ) @@ -41,21 +39,14 @@ func init() { } func makeTestingHost(t *testing.T) host.Host { - priv, pub, _ := crypto.GenerateKeyPair(crypto.RSA, 2048) - pid, _ := peer.IDFromPublicKey(pub) - - //maddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", idn)) - // Bind on random port - maddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0") - ps := peerstore.NewPeerstore() - ps.AddPubKey(pid, pub) - ps.AddPrivKey(pid, priv) - ps.AddAddr(pid, maddr, peerstore.PermanentAddrTTL) - n, _ := swarm.NewNetwork( + h, err := libp2p.New( context.Background(), - []ma.Multiaddr{maddr}, - pid, ps, nil) - return basichost.New(n) + libp2p.ListenAddrStrings("/ip4/127.0.0.1/tcp/0"), + ) + if err != nil { + t.Fatal(err) + } + return h } func testingConsensus(t *testing.T, idn int) *Consensus {