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

dht tests: dont introduce nil multiaddr

Browse Source 
this is the type of assumption we shouldn't violate.
This commit is contained in:
Juan Batiz-Benet
2014-11-20 11:02:13 -08:00
parent c5c0e7e8f3
commit 26e7656164
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
peer/peer.go
View File

@ -209,6 +209,10 @@ func (p *peer) Addresses() []ma.Multiaddr {
// AddAddress adds the given Multiaddr address to Peer's addresses.
// Returns whether this address was a newly added address
func (p *peer) AddAddress(a ma.Multiaddr) bool {
if a == nil {
panic("adding a nil Multiaddr")
}
p.Lock()
defer p.Unlock()

8
routing/dht/dht_test.go
View File

@ -64,6 +64,14 @@ func setupDHTS(ctx context.Context, n int, t *testing.T) ([]ma.Multiaddr, []peer
return addrs, peers, dhts
}
func makePeerString(t *testing.T, addr string) peer.Peer {
maddr, err := ma.NewMultiaddr(addr)
if err != nil {
t.Fatal(err)
}
return makePeer(maddr)
}
func makePeer(addr ma.Multiaddr) peer.Peer {
sk, pk, err := ci.GenerateKeyPair(ci.RSA, 512)
if err != nil {

8
routing/dht/ext_test.go
View File

@ -125,10 +125,10 @@ func TestGetFailures(t *testing.T) {
fs := &fauxSender{}
peerstore := peer.NewPeerstore()
local := makePeer(nil)
local := makePeerString(t, "")
d := NewDHT(ctx, local, peerstore, fn, fs, ds.NewMapDatastore())
other := makePeer(nil)
other := makePeerString(t, "")
d.Update(ctx, other)
// This one should time out
@ -223,7 +223,7 @@ func TestNotFound(t *testing.T) {
fn := &fauxNet{}
fs := &fauxSender{}
local := makePeer(nil)
local := makePeerString(t, "")
peerstore := peer.NewPeerstore()
peerstore.Add(local)
@ -289,7 +289,7 @@ func TestLessThanKResponses(t *testing.T) {
u.Debug = false
fn := &fauxNet{}
fs := &fauxSender{}
local := makePeer(nil)
local := makePeerString(t, "")
peerstore := peer.NewPeerstore()
peerstore.Add(local)