call the routing interface BasicRouting, alias to top level type

This commit is contained in:
vyzo 2018-10-22 21:20:31 +03:00
parent 89aef893e6
commit a7e1bf0f15
3 changed files with 6 additions and 4 deletions

View File

@ -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
//

View File

@ -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 {

View File

@ -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
}