Added a Default listener #378
Conversation
defaults.go
Outdated
| @@ -52,6 +53,15 @@ var RandomIdentity = func(cfg *Config) error { | |||
| return cfg.Apply(Identity(priv)) | |||
| } | |||
|
|
|||
| // DefaultListenAddrs configures libp2p to use default listen address | |||
| var DefaultListenAddrs = func(cfg *Config) error { | |||
| defaultListenAddr, err := multiaddr.NewMultiaddr("/ip4/0.0.0.0/tcp/0") | |||
There was a problem hiding this comment.
This should also support ip6.
defaults.go
Outdated
| @@ -80,6 +90,10 @@ var defaults = []struct { | |||
| fallback: func(cfg *Config) bool { return cfg.Peerstore == nil }, | |||
| opt: DefaultPeerstore, | |||
| }, | |||
| { | |||
| fallback: func(cfg *Config) bool { return cfg.ListenAddrs == nil }, | |||
There was a problem hiding this comment.
We should probably only apply these if we are using the default transports. I'd put this before the default transport section and check to see if Transports is nil.
|
@Stebalien done. |
| @@ -39,6 +40,39 @@ func TestInsecure(t *testing.T) { | |||
| h.Close() | |||
| } | |||
|
|
|||
| func TestDefaultListenAddrs(t *testing.T) { | |||
There was a problem hiding this comment.
Should have a "correctly set the default listeners" test (i.e., make sure this actually works).
There was a problem hiding this comment.
Something like this?
h, err := New(ctx)
if err != nil {
t.Fatal(err)
}
if len(h.Addrs()) != 2 {
t.Error("expected 2 default listen addrs")
}
h.Close()Is length of h.Addrs() sufficient for tests or should they be compared with the actual strings?
There was a problem hiding this comment.
That's probably good enough. Thanks!
There was a problem hiding this comment.
I think that test error is due to how we expand ALL addresses using the interface addresses in Host.Addrs(). Try calling h.Network().ListenAddresses(). In that case, we should even be able to verify that they are the correct addresses.
|
@Stebalien Is jenkins only responsible for tests w/o compiling? |
| @@ -39,6 +40,39 @@ func TestInsecure(t *testing.T) { | |||
| h.Close() | |||
| } | |||
|
|
|||
| func TestDefaultListenAddrs(t *testing.T) { | |||
There was a problem hiding this comment.
That's probably good enough. Thanks!
|
@Stebalien My assumption was incorrect. I was assuming that if host, err := libp2p.New(
ctx,
libp2p.ListenAddrStrings("ip4/0.0.0.0/tcp/0", "ip6/0.0.0.0/tcp/0"),
)then For So all my tests are incorrect. What do you suggest. How should I test? Test could be designed in a way that if either one of |
|
I'd check for |
defaults.go
Outdated
| return err | ||
| } | ||
|
|
||
| defaultIP6ListenAddr, err := multiaddr.NewMultiaddr("/ip6/0.0.0.0/tcp/0") |
There was a problem hiding this comment.
This should be /ip6/::/tcp/0 (sorry for not noticing earlier). You'll also have to fix the test. 0.0.0.0 will use the IP4 over IP6 ALL address.
|
Thanks @Stebalien |
Solving #377
Added IPV4 - TCP on a random port as a default listener (
/ip4/0.0.0.0/tcp/0)@Stebalien can you please review.