Merge pull request #225 from libp2p/fix/slim-dependencies

slim down dependencies

go.mod

@@ -7,12 +7,9 @@ require (
 	github.com/jbenet/goprocess v0.1.4
 	github.com/libp2p/go-addr-util v0.0.2
 	github.com/libp2p/go-conn-security-multistream v0.2.0
-	github.com/libp2p/go-libp2p-circuit v0.2.3
 	github.com/libp2p/go-libp2p-core v0.6.0
 	github.com/libp2p/go-libp2p-loggables v0.1.0
-	github.com/libp2p/go-libp2p-peerstore v0.2.4
-	github.com/libp2p/go-libp2p-quic-transport v0.5.0
-	github.com/libp2p/go-libp2p-secio v0.2.2
+	github.com/libp2p/go-libp2p-peerstore v0.2.6
 	github.com/libp2p/go-libp2p-testing v0.1.1
 	github.com/libp2p/go-libp2p-transport-upgrader v0.3.0
 	github.com/libp2p/go-libp2p-yamux v0.2.8
@@ -21,6 +18,6 @@ require (
 	github.com/multiformats/go-multiaddr v0.2.2
 	github.com/multiformats/go-multiaddr-fmt v0.1.0
 	github.com/multiformats/go-multiaddr-net v0.1.5
-	github.com/stretchr/testify v1.6.0
+	github.com/stretchr/testify v1.6.1
 	github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
 )

swarm_test.go

@@ -15,8 +15,6 @@ import (
 	"github.com/libp2p/go-libp2p-core/peerstore"
 	"github.com/libp2p/go-libp2p-core/test"
 
-	circuit "github.com/libp2p/go-libp2p-circuit"
-	qc "github.com/libp2p/go-libp2p-quic-transport"
 	. "github.com/libp2p/go-libp2p-swarm"
 	. "github.com/libp2p/go-libp2p-swarm/testing"
 
@@ -425,10 +423,6 @@ func TestIsFdConsuming(t *testing.T) {
 	sw := GenSwarm(t, ctx)
 	sk := sw.Peerstore().PrivKey(sw.LocalPeer())
 	require.NotNil(t, sk)
-	qtpt, err := qc.NewTransport(sk, nil, nil)
-	require.NoError(t, err)
-	require.NoError(t, sw.AddTransport(qtpt))
-	require.NoError(t, sw.AddTransport(&circuit.RelayTransport{}))
 
 	for name := range tcs {
 		maddr, err := ma.NewMultiaddr(tcs[name].addr)

testing/testing.go

@@ -11,10 +11,10 @@ import (
 	"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/sec/insecure"
 
 	csms "github.com/libp2p/go-conn-security-multistream"
 	pstoremem "github.com/libp2p/go-libp2p-peerstore/pstoremem"
-	secio "github.com/libp2p/go-libp2p-secio"
 	swarm "github.com/libp2p/go-libp2p-swarm"
 	"github.com/libp2p/go-libp2p-testing/net"
 	tptu "github.com/libp2p/go-libp2p-transport-upgrader"
@@ -65,10 +65,7 @@ func GenUpgrader(n *swarm.Swarm) *tptu.Upgrader {
 	id := n.LocalPeer()
 	pk := n.Peerstore().PrivKey(id)
 	secMuxer := new(csms.SSMuxer)
-	secMuxer.AddTransport(secio.ID, &secio.Transport{
-		LocalID:    id,
-		PrivateKey: pk,
-	})
+	secMuxer.AddTransport(insecure.ID, insecure.NewWithIdentity(id, pk))
 
 	stMuxer := msmux.NewBlankTransport()
 	stMuxer.AddTransport("/yamux/1.0.0", yamux.DefaultTransport)