restrict the Muxer option to already constructed network.Multiplexers

config/config.go

@@ -73,7 +73,7 @@ type Config struct {
  PeerKey crypto.PrivKey
 
  Transports []fx.Option
- Muxers []MsMuxC
+ Muxers []Muxer
  SecurityTransports []fx.Option
  Insecure bool
  PSK pnet.PSK
@@ -171,8 +171,8 @@ func (cfg *Config) addTransports(h host.Host) error {
  }
 
  muxers := make([]protocol.ID, 0, len(cfg.Muxers))
- for _, muxc := range cfg.Muxers {
- muxers = append(muxers, protocol.ID(muxc.ID))
+ for _, m := range cfg.Muxers {
+ muxers = append(muxers, m.ID)
  }
 
  var security []fx.Option
@@ -181,7 +181,7 @@ func (cfg *Config) addTransports(h host.Host) error {
  } else {
  security = cfg.SecurityTransports
  }
- muxer, err := makeMuxer(h, cfg.Muxers)
+ muxer, err := makeMuxer(cfg.Muxers)
  if err != nil {
  return err
  }

config/muxer.go

@@ -3,61 +3,27 @@ package config
 import (
  "fmt"
 
- "github.com/libp2p/go-libp2p/core/host"
  "github.com/libp2p/go-libp2p/core/network"
+ "github.com/libp2p/go-libp2p/core/protocol"
  msmux "github.com/libp2p/go-libp2p/p2p/muxer/muxer-multistream"
 )
 
-// MuxC is a stream multiplex transport constructor.
-type MuxC func(h host.Host) (network.Multiplexer, error)
-
-// MsMuxC is a tuple containing a multiplex transport constructor and a protocol
-// ID.
-type MsMuxC struct {
- MuxC
- ID string
+type Muxer struct {
+ ID protocol.ID
+ Multiplexer network.Multiplexer
 }
 
-var muxArgTypes = newArgTypeSet(hostType, networkType, peerIDType, pstoreType)
-
-// MuxerConstructor creates a multiplex constructor from the passed parameter
-// using reflection.
-func MuxerConstructor(m interface{}) (MuxC, error) {
- // Already constructed?
- if t, ok := m.(network.Multiplexer); ok {
- return func(_ host.Host) (network.Multiplexer, error) {
- return t, nil
- }, nil
- }
-
- ctor, err := makeConstructor(m, muxType, muxArgTypes)
- if err != nil {
- return nil, err
- }
- return func(h host.Host) (network.Multiplexer, error) {
- t, err := ctor(h, nil, nil, nil, nil, nil, nil)
- if err != nil {
- return nil, err
- }
- return t.(network.Multiplexer), nil
- }, nil
-}
-
-func makeMuxer(h host.Host, tpts []MsMuxC) (network.Multiplexer, error) {
+func makeMuxer(muxers []Muxer) (network.Multiplexer, error) {
  muxMuxer := msmux.NewBlankTransport()
- transportSet := make(map[string]struct{}, len(tpts))
- for _, tptC := range tpts {
- if _, ok := transportSet[tptC.ID]; ok {
- return nil, fmt.Errorf("duplicate muxer transport: %s", tptC.ID)
+ transportSet := make(map[protocol.ID]struct{}, len(muxers))
+ for _, m := range muxers {
+ if _, ok := transportSet[m.ID]; ok {
+ return nil, fmt.Errorf("duplicate muxer transport: %s", m.ID)
  }
- transportSet[tptC.ID] = struct{}{}
+ transportSet[m.ID] = struct{}{}
  }
- for _, tptC := range tpts {
- tpt, err := tptC.MuxC(h)
- if err != nil {
- return nil, err
- }
- muxMuxer.AddTransport(tptC.ID, tpt)
+ for _, m := range muxers {
+ muxMuxer.AddTransport(string(m.ID), m.Multiplexer)
  }
  return muxMuxer, nil
 }