Browse Source

call the routing interface BasicRouting, alias to top level type

pull/454/head
vyzo 6 years ago
parent
commit
a7e1bf0f15
  1. 4
      config/config.go
  2. 3
      libp2p.go
  3. 3
      p2p/host/relay/autorelay_test.go

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

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

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

Loading…
Cancel
Save