diff --git a/config/config.go b/config/config.go index aa06705c4fb023b1e519a07a275052f4907204ea..3d06fdca0a53808e9db12011842e7a0c1f7af33f 100644 --- a/config/config.go +++ b/config/config.go @@ -35,12 +35,12 @@ type AddrsFactory = bhost.AddrsFactory // NATManagerC is a NATManager constructor. type NATManagerC func(inet.Network) bhost.NATManager -type Routing interface { +type BasicRouting interface { routing.ContentRouting routing.PeerRouting } -type RoutingC func(host.Host) (Routing, error) +type RoutingC func(host.Host) (BasicRouting, error) // Config describes a set of settings for a libp2p node // diff --git a/libp2p.go b/libp2p.go index ad026ad4bd8439099b78ed749af57cab2baccf1c..6c928c31595259ea0b1809351b21f789878b928f 100644 --- a/libp2p.go +++ b/libp2p.go @@ -15,6 +15,9 @@ type Config = config.Config // (`libp2p.New`). type Option = config.Option +// BasicRouting is the combination of PeerRouting and ContentRouting +type BasicRouting = config.BasicRouting + // ChainOptions chains multiple options into a single option. func ChainOptions(opts ...Option) Option { return func(cfg *Config) error { diff --git a/p2p/host/relay/autorelay_test.go b/p2p/host/relay/autorelay_test.go index 38e7f518c47646c3989cb5ce82a5d3a73ef17e67..ff4d850715ea12b34645a3b704a048b01e0d0856 100644 --- a/p2p/host/relay/autorelay_test.go +++ b/p2p/host/relay/autorelay_test.go @@ -8,7 +8,6 @@ import ( "time" libp2p "github.com/libp2p/go-libp2p" - config "github.com/libp2p/go-libp2p/config" relay "github.com/libp2p/go-libp2p/p2p/host/relay" ggio "github.com/gogo/protobuf/io" @@ -137,7 +136,7 @@ func TestAutoRelay(t *testing.T) { defer cancel() mtab := newMockRoutingTable() - makeRouting := func(h host.Host) (config.Routing, error) { + makeRouting := func(h host.Host) (libp2p.BasicRouting, error) { mr := newMockRouting(h, mtab) return mr, nil }