Consolidate abstractions and core types into go-libp2p-core (#601)

config/config.go

@@ -4,24 +4,26 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/libp2p/go-libp2p-core/connmgr"
+	"github.com/libp2p/go-libp2p-core/crypto"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/metrics"
+	"github.com/libp2p/go-libp2p-core/network"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/peerstore"
+	"github.com/libp2p/go-libp2p-core/pnet"
+	"github.com/libp2p/go-libp2p-core/routing"
+
 	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
 	relay "github.com/libp2p/go-libp2p/p2p/host/relay"
 	routed "github.com/libp2p/go-libp2p/p2p/host/routed"
 
-	logging "github.com/ipfs/go-log"
 	circuit "github.com/libp2p/go-libp2p-circuit"
-	crypto "github.com/libp2p/go-libp2p-crypto"
 	discovery "github.com/libp2p/go-libp2p-discovery"
-	host "github.com/libp2p/go-libp2p-host"
-	ifconnmgr "github.com/libp2p/go-libp2p-interface-connmgr"
-	pnet "github.com/libp2p/go-libp2p-interface-pnet"
-	metrics "github.com/libp2p/go-libp2p-metrics"
-	inet "github.com/libp2p/go-libp2p-net"
-	peer "github.com/libp2p/go-libp2p-peer"
-	pstore "github.com/libp2p/go-libp2p-peerstore"
-	routing "github.com/libp2p/go-libp2p-routing"
 	swarm "github.com/libp2p/go-libp2p-swarm"
 	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
+
+	logging "github.com/ipfs/go-log"
 	filter "github.com/libp2p/go-maddr-filter"
 	ma "github.com/multiformats/go-multiaddr"
 )
@@ -33,7 +35,7 @@ var log = logging.Logger("p2p-config")
 type AddrsFactory = bhost.AddrsFactory
 
 // NATManagerC is a NATManager constructor.
-type NATManagerC func(inet.Network) bhost.NATManager
+type NATManagerC func(network.Network) bhost.NATManager
 
 type RoutingC func(host.Host) (routing.PeerRouting, error)
 
@@ -58,9 +60,9 @@ type Config struct {
 	AddrsFactory bhost.AddrsFactory
 	Filters      *filter.Filters
 
-	ConnManager ifconnmgr.ConnManager
+	ConnManager connmgr.ConnManager
 	NATManager  NATManagerC
-	Peerstore   pstore.Peerstore
+	Peerstore   peerstore.Peerstore
 	Reporter    metrics.Reporter
 
 	DisablePing bool

config/constructor_types.go

@@ -4,30 +4,31 @@ import (
 	"fmt"
 	"reflect"
 
-	security "github.com/libp2p/go-conn-security"
-	crypto "github.com/libp2p/go-libp2p-crypto"
-	host "github.com/libp2p/go-libp2p-host"
-	pnet "github.com/libp2p/go-libp2p-interface-pnet"
-	inet "github.com/libp2p/go-libp2p-net"
-	peer "github.com/libp2p/go-libp2p-peer"
-	pstore "github.com/libp2p/go-libp2p-peerstore"
-	transport "github.com/libp2p/go-libp2p-transport"
+	"github.com/libp2p/go-libp2p-core/crypto"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/mux"
+	"github.com/libp2p/go-libp2p-core/network"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/peerstore"
+	"github.com/libp2p/go-libp2p-core/pnet"
+	"github.com/libp2p/go-libp2p-core/sec"
+	"github.com/libp2p/go-libp2p-core/transport"
+
 	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
 	filter "github.com/libp2p/go-maddr-filter"
-	mux "github.com/libp2p/go-stream-muxer"
 )
 
 var (
 	// interfaces
 	hostType      = reflect.TypeOf((*host.Host)(nil)).Elem()
-	networkType   = reflect.TypeOf((*inet.Network)(nil)).Elem()
+	networkType   = reflect.TypeOf((*network.Network)(nil)).Elem()
 	transportType = reflect.TypeOf((*transport.Transport)(nil)).Elem()
-	muxType       = reflect.TypeOf((*mux.Transport)(nil)).Elem()
-	securityType  = reflect.TypeOf((*security.Transport)(nil)).Elem()
+	muxType       = reflect.TypeOf((*mux.Multiplexer)(nil)).Elem()
+	securityType  = reflect.TypeOf((*sec.SecureTransport)(nil)).Elem()
 	protectorType = reflect.TypeOf((*pnet.Protector)(nil)).Elem()
 	privKeyType   = reflect.TypeOf((*crypto.PrivKey)(nil)).Elem()
 	pubKeyType    = reflect.TypeOf((*crypto.PubKey)(nil)).Elem()
-	pstoreType    = reflect.TypeOf((*pstore.Peerstore)(nil)).Elem()
+	pstoreType    = reflect.TypeOf((*peerstore.Peerstore)(nil)).Elem()
 
 	// concrete types
 	peerIDType   = reflect.TypeOf((peer.ID)(""))

config/muxer.go

@@ -3,13 +3,13 @@ package config
 import (
 	"fmt"
 
-	host "github.com/libp2p/go-libp2p-host"
-	mux "github.com/libp2p/go-stream-muxer"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/mux"
 	msmux "github.com/libp2p/go-stream-muxer-multistream"
 )
 
 // MuxC is a stream multiplex transport constructor
-type MuxC func(h host.Host) (mux.Transport, error)
+type MuxC func(h host.Host) (mux.Multiplexer, error)
 
 // MsMuxC is a tuple containing a multiplex transport constructor and a protocol
 // ID.
@@ -24,8 +24,8 @@ var muxArgTypes = newArgTypeSet(hostType, networkType, peerIDType, pstoreType)
 // using reflection.
 func MuxerConstructor(m interface{}) (MuxC, error) {
 	// Already constructed?
-	if t, ok := m.(mux.Transport); ok {
-		return func(_ host.Host) (mux.Transport, error) {
+	if t, ok := m.(mux.Multiplexer); ok {
+		return func(_ host.Host) (mux.Multiplexer, error) {
 			return t, nil
 		}, nil
 	}
@@ -34,16 +34,16 @@ func MuxerConstructor(m interface{}) (MuxC, error) {
 	if err != nil {
 		return nil, err
 	}
-	return func(h host.Host) (mux.Transport, error) {
+	return func(h host.Host) (mux.Multiplexer, error) {
 		t, err := ctor(h, nil)
 		if err != nil {
 			return nil, err
 		}
-		return t.(mux.Transport), nil
+		return t.(mux.Multiplexer), nil
 	}, nil
 }
 
-func makeMuxer(h host.Host, tpts []MsMuxC) (mux.Transport, error) {
+func makeMuxer(h host.Host, tpts []MsMuxC) (mux.Multiplexer, error) {
 	muxMuxer := msmux.NewBlankTransport()
 	transportSet := make(map[string]struct{}, len(tpts))
 	for _, tptC := range tpts {

config/muxer_test.go

@@ -4,17 +4,18 @@ import (
 	"context"
 	"testing"
 
-	host "github.com/libp2p/go-libp2p-host"
-	peer "github.com/libp2p/go-libp2p-peer"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/peer"
 	swarmt "github.com/libp2p/go-libp2p-swarm/testing"
-	yamux "github.com/libp2p/go-libp2p-yamux"
 	bhost "github.com/libp2p/go-libp2p/p2p/host/basic"
-	mux "github.com/libp2p/go-stream-muxer"
+
+	mux "github.com/libp2p/go-libp2p-core/mux"
+	yamux "github.com/libp2p/go-libp2p-yamux"
 )
 
 func TestMuxerSimple(t *testing.T) {
 	// single
-	_, err := MuxerConstructor(func(_ peer.ID) mux.Transport { return nil })
+	_, err := MuxerConstructor(func(_ peer.ID) mux.Multiplexer { return nil })
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -27,14 +28,14 @@ func TestMuxerByValue(t *testing.T) {
 	}
 }
 func TestMuxerDuplicate(t *testing.T) {
-	_, err := MuxerConstructor(func(_ peer.ID, _ peer.ID) mux.Transport { return nil })
+	_, err := MuxerConstructor(func(_ peer.ID, _ peer.ID) mux.Multiplexer { return nil })
 	if err != nil {
 		t.Fatal(err)
 	}
 }
 
 func TestMuxerError(t *testing.T) {
-	_, err := MuxerConstructor(func() (mux.Transport, error) { return nil, nil })
+	_, err := MuxerConstructor(func() (mux.Multiplexer, error) { return nil, nil })
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -45,8 +46,8 @@ func TestMuxerBadTypes(t *testing.T) {
 		func() error { return nil },
 		func() string { return "" },
 		func() {},
-		func(string) mux.Transport { return nil },
-		func(string) (mux.Transport, error) { return nil, nil },
+		func(string) mux.Multiplexer { return nil },
+		func(string) (mux.Multiplexer, error) { return nil, nil },
 		nil,
 		"testing",
 	} {

config/reflection_magic.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"runtime"
 
-	host "github.com/libp2p/go-libp2p-host"
+	"github.com/libp2p/go-libp2p-core/host"
 	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
 )
 

config/security.go

@@ -3,15 +3,16 @@ package config
 import (
 	"fmt"
 
-	security "github.com/libp2p/go-conn-security"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/peer"
+	"github.com/libp2p/go-libp2p-core/sec"
+	"github.com/libp2p/go-libp2p-core/sec/insecure"
+
 	csms "github.com/libp2p/go-conn-security-multistream"
-	insecure "github.com/libp2p/go-conn-security/insecure"
-	host "github.com/libp2p/go-libp2p-host"
-	peer "github.com/libp2p/go-libp2p-peer"
 )
 
 // SecC is a security transport constructor
-type SecC func(h host.Host) (security.Transport, error)
+type SecC func(h host.Host) (sec.SecureTransport, error)
 
 // MsSecC is a tuple containing a security transport constructor and a protocol
 // ID.
@@ -27,34 +28,34 @@ var securityArgTypes = newArgTypeSet(
 
 // SecurityConstructor creates a security constructor from the passed parameter
 // using reflection.
-func SecurityConstructor(sec interface{}) (SecC, error) {
+func SecurityConstructor(security interface{}) (SecC, error) {
 	// Already constructed?
-	if t, ok := sec.(security.Transport); ok {
-		return func(_ host.Host) (security.Transport, error) {
+	if t, ok := security.(sec.SecureTransport); ok {
+		return func(_ host.Host) (sec.SecureTransport, error) {
 			return t, nil
 		}, nil
 	}
 
-	ctor, err := makeConstructor(sec, securityType, securityArgTypes)
+	ctor, err := makeConstructor(security, securityType, securityArgTypes)
 	if err != nil {
 		return nil, err
 	}
-	return func(h host.Host) (security.Transport, error) {
+	return func(h host.Host) (sec.SecureTransport, error) {
 		t, err := ctor(h, nil)
 		if err != nil {
 			return nil, err
 		}
-		return t.(security.Transport), nil
+		return t.(sec.SecureTransport), nil
 	}, nil
 }
 
-func makeInsecureTransport(id peer.ID) security.Transport {
+func makeInsecureTransport(id peer.ID) sec.SecureTransport {
 	secMuxer := new(csms.SSMuxer)
 	secMuxer.AddTransport(insecure.ID, insecure.New(id))
 	return secMuxer
 }
 
-func makeSecurityTransport(h host.Host, tpts []MsSecC) (security.Transport, error) {
+func makeSecurityTransport(h host.Host, tpts []MsSecC) (sec.SecureTransport, error) {
 	secMuxer := new(csms.SSMuxer)
 	transportSet := make(map[string]struct{}, len(tpts))
 	for _, tptC := range tpts {

config/transport.go

@@ -1,8 +1,9 @@
 package config
 
 import (
-	host "github.com/libp2p/go-libp2p-host"
-	transport "github.com/libp2p/go-libp2p-transport"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/transport"
+
 	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
 )
 

defaults.go

@@ -5,7 +5,7 @@ package libp2p
 import (
 	"crypto/rand"
 
-	crypto "github.com/libp2p/go-libp2p-crypto"
+	crypto "github.com/libp2p/go-libp2p-core/crypto"
 	mplex "github.com/libp2p/go-libp2p-mplex"
 	pstoremem "github.com/libp2p/go-libp2p-peerstore/pstoremem"
 	secio "github.com/libp2p/go-libp2p-secio"

go.mod

@@ -8,41 +8,30 @@ require (
 	github.com/ipfs/go-log v0.0.1
 	github.com/jbenet/go-cienv v0.1.0
 	github.com/jbenet/goprocess v0.1.3
-	github.com/libp2p/go-conn-security v0.0.1
-	github.com/libp2p/go-conn-security-multistream v0.0.2
-	github.com/libp2p/go-libp2p-autonat v0.0.6
-	github.com/libp2p/go-libp2p-blankhost v0.0.1
-	github.com/libp2p/go-libp2p-circuit v0.0.9
-	github.com/libp2p/go-libp2p-crypto v0.0.2
-	github.com/libp2p/go-libp2p-discovery v0.0.5
-	github.com/libp2p/go-libp2p-host v0.0.3
-	github.com/libp2p/go-libp2p-interface-connmgr v0.0.5
-	github.com/libp2p/go-libp2p-interface-pnet v0.0.1
-	github.com/libp2p/go-libp2p-loggables v0.0.1
-	github.com/libp2p/go-libp2p-metrics v0.0.1
-	github.com/libp2p/go-libp2p-mplex v0.1.1
+	github.com/libp2p/go-conn-security-multistream v0.1.0
+	github.com/libp2p/go-libp2p-autonat v0.1.0
+	github.com/libp2p/go-libp2p-blankhost v0.1.1
+	github.com/libp2p/go-libp2p-circuit v0.1.0
+	github.com/libp2p/go-libp2p-core v0.0.1
+	github.com/libp2p/go-libp2p-discovery v0.1.0
+	github.com/libp2p/go-libp2p-loggables v0.1.0
+	github.com/libp2p/go-libp2p-mplex v0.2.1
 	github.com/libp2p/go-libp2p-nat v0.0.4
-	github.com/libp2p/go-libp2p-net v0.0.2
-	github.com/libp2p/go-libp2p-netutil v0.0.1
-	github.com/libp2p/go-libp2p-peer v0.1.1
-	github.com/libp2p/go-libp2p-peerstore v0.0.6
-	github.com/libp2p/go-libp2p-protocol v0.0.1
-	github.com/libp2p/go-libp2p-routing v0.0.1
-	github.com/libp2p/go-libp2p-secio v0.0.3
-	github.com/libp2p/go-libp2p-swarm v0.0.6
-	github.com/libp2p/go-libp2p-transport v0.0.5
-	github.com/libp2p/go-libp2p-transport-upgrader v0.0.4
-	github.com/libp2p/go-libp2p-yamux v0.1.2
+	github.com/libp2p/go-libp2p-netutil v0.1.0
+	github.com/libp2p/go-libp2p-peerstore v0.1.0
+	github.com/libp2p/go-libp2p-secio v0.1.0
+	github.com/libp2p/go-libp2p-swarm v0.1.0
+	github.com/libp2p/go-libp2p-testing v0.0.3
+	github.com/libp2p/go-libp2p-transport-upgrader v0.1.1
+	github.com/libp2p/go-libp2p-yamux v0.2.0
 	github.com/libp2p/go-maddr-filter v0.0.4
-	github.com/libp2p/go-stream-muxer v0.0.1
-	github.com/libp2p/go-stream-muxer-multistream v0.1.1
-	github.com/libp2p/go-tcp-transport v0.0.4
-	github.com/libp2p/go-testutil v0.0.1
-	github.com/libp2p/go-ws-transport v0.0.5
+	github.com/libp2p/go-stream-muxer-multistream v0.2.0
+	github.com/libp2p/go-tcp-transport v0.1.0
+	github.com/libp2p/go-ws-transport v0.1.0
 	github.com/miekg/dns v1.1.12 // indirect
 	github.com/multiformats/go-multiaddr v0.0.4
 	github.com/multiformats/go-multiaddr-dns v0.0.2
 	github.com/multiformats/go-multiaddr-net v0.0.1
-	github.com/multiformats/go-multistream v0.0.4
+	github.com/multiformats/go-multistream v0.1.0
 	github.com/whyrusleeping/mdns v0.0.0-20180901202407-ef14215e6b30
 )