Merge pull request multiformats#22 from libp2p/feat/consolidate-abstr…

…actions

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

conn.go

@@ -3,15 +3,15 @@ package stream
 import (
 	"fmt"
 
-	inet "github.com/libp2p/go-libp2p-net"
-	transport "github.com/libp2p/go-libp2p-transport"
-	smux "github.com/libp2p/go-stream-muxer"
+	mux "github.com/libp2p/go-libp2p-core/mux"
+	network "github.com/libp2p/go-libp2p-core/network"
+	transport "github.com/libp2p/go-libp2p-core/transport"
 )
 
 type transportConn struct {
-	smux.Conn
-	inet.ConnMultiaddrs
-	inet.ConnSecurity
+	mux.MuxedConn
+	network.ConnMultiaddrs
+	network.ConnSecurity
 	transport transport.Transport
 }
 

go.mod

@@ -3,16 +3,16 @@ module github.com/libp2p/go-libp2p-transport-upgrader
 require (
 	github.com/ipfs/go-log v0.0.1
 	github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2
-	github.com/libp2p/go-conn-security v0.0.1
-	github.com/libp2p/go-libp2p-interface-pnet v0.0.1
+	github.com/libp2p/go-libp2p-core v0.0.1
 	github.com/libp2p/go-libp2p-mplex v0.1.1
-	github.com/libp2p/go-libp2p-net v0.0.1
-	github.com/libp2p/go-libp2p-peer v0.0.1
-	github.com/libp2p/go-libp2p-transport v0.0.1
-	github.com/libp2p/go-maddr-filter v0.0.1
-	github.com/libp2p/go-stream-muxer v0.0.1
-	github.com/multiformats/go-multiaddr v0.0.1
+	github.com/libp2p/go-libp2p-testing v0.0.2 // indirect
+	github.com/libp2p/go-maddr-filter v0.0.4
+	github.com/libp2p/go-mplex v0.0.4 // indirect
+	github.com/libp2p/go-stream-muxer v0.1.0 // indirect
+	github.com/multiformats/go-multiaddr v0.0.4
+	github.com/multiformats/go-multiaddr-dns v0.0.2 // indirect
 	github.com/multiformats/go-multiaddr-net v0.0.1
-	github.com/onsi/ginkgo v1.7.0
-	github.com/onsi/gomega v1.4.3
+	github.com/multiformats/go-multihash v0.0.5 // indirect
+	github.com/onsi/ginkgo v1.8.0
+	github.com/onsi/gomega v1.5.0
 )