Unverified Commit d9aafa05 authored by Marten Seemann's avatar Marten Seemann
Browse files

remove unused peerstore from listener

parent 650c49b4
...@@ -29,7 +29,7 @@ var _ = Describe("Listener", func() { ...@@ -29,7 +29,7 @@ var _ = Describe("Listener", func() {
var ln *listener var ln *listener
go func() { go func() {
defer GinkgoRecover() defer GinkgoRecover()
ln, err = newListener(addr, nil, transport) ln, err = newListener(addr, transport)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
_, err = ln.Accept() _, err = ln.Accept()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
......
...@@ -3,7 +3,6 @@ package libp2pquic ...@@ -3,7 +3,6 @@ package libp2pquic
import ( import (
"net" "net"
pstore "github.com/libp2p/go-libp2p-peerstore"
tpt "github.com/libp2p/go-libp2p-transport" tpt "github.com/libp2p/go-libp2p-transport"
testdata "github.com/lucas-clemente/quic-go/testdata" testdata "github.com/lucas-clemente/quic-go/testdata"
quicconn "github.com/marten-seemann/quic-conn" quicconn "github.com/marten-seemann/quic-conn"
...@@ -18,7 +17,7 @@ type listener struct { ...@@ -18,7 +17,7 @@ type listener struct {
transport tpt.Transport transport tpt.Transport
} }
func newListener(laddr ma.Multiaddr, peers pstore.Peerstore, transport tpt.Transport) (*listener, error) { func newListener(laddr ma.Multiaddr, transport tpt.Transport) (*listener, error) {
// we need to provide a certificate here // we need to provide a certificate here
// use the demo certificate from quic-go // use the demo certificate from quic-go
tlsConf := testdata.GetTLSConfig() tlsConf := testdata.GetTLSConfig()
......
...@@ -54,7 +54,7 @@ var _ = Describe("Listener", func() { ...@@ -54,7 +54,7 @@ var _ = Describe("Listener", func() {
It("returns its addr", func() { It("returns its addr", func() {
laddr, err := ma.NewMultiaddr("/ip4/127.0.0.1/udp/12345/quic") laddr, err := ma.NewMultiaddr("/ip4/127.0.0.1/udp/12345/quic")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
l, err = newListener(laddr, nil, nil) l, err = newListener(laddr, nil)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(l.Addr().String()).To(Equal("127.0.0.1:12345")) Expect(l.Addr().String()).To(Equal("127.0.0.1:12345"))
}) })
...@@ -62,7 +62,7 @@ var _ = Describe("Listener", func() { ...@@ -62,7 +62,7 @@ var _ = Describe("Listener", func() {
It("returns its multiaddr", func() { It("returns its multiaddr", func() {
laddr, err := ma.NewMultiaddr("/ip4/127.0.0.1/udp/12346/quic") laddr, err := ma.NewMultiaddr("/ip4/127.0.0.1/udp/12346/quic")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
l, err = newListener(laddr, nil, nil) l, err = newListener(laddr, nil)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(l.Multiaddr().String()).To(Equal("/ip4/127.0.0.1/udp/12346/quic")) Expect(l.Multiaddr().String()).To(Equal("/ip4/127.0.0.1/udp/12346/quic"))
}) })
......
...@@ -4,7 +4,6 @@ import ( ...@@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"sync" "sync"
pstore "github.com/libp2p/go-libp2p-peerstore"
tpt "github.com/libp2p/go-libp2p-transport" tpt "github.com/libp2p/go-libp2p-transport"
ma "github.com/multiformats/go-multiaddr" ma "github.com/multiformats/go-multiaddr"
"github.com/whyrusleeping/mafmt" "github.com/whyrusleeping/mafmt"
...@@ -12,8 +11,6 @@ import ( ...@@ -12,8 +11,6 @@ import (
// QuicTransport implements a QUIC Transport // QuicTransport implements a QUIC Transport
type QuicTransport struct { type QuicTransport struct {
peers pstore.Peerstore
lmutex sync.Mutex lmutex sync.Mutex
listeners map[string]tpt.Listener listeners map[string]tpt.Listener
...@@ -23,10 +20,9 @@ type QuicTransport struct { ...@@ -23,10 +20,9 @@ type QuicTransport struct {
// NewQuicTransport creates a new QUIC Transport // NewQuicTransport creates a new QUIC Transport
// it tracks dialers and listeners created // it tracks dialers and listeners created
func NewQuicTransport(peers pstore.Peerstore) *QuicTransport { func NewQuicTransport() *QuicTransport {
// utils.SetLogLevel(utils.LogLevelDebug) // utils.SetLogLevel(utils.LogLevelDebug)
return &QuicTransport{ return &QuicTransport{
peers: peers,
listeners: make(map[string]tpt.Listener), listeners: make(map[string]tpt.Listener),
dialers: make(map[string]tpt.Dialer), dialers: make(map[string]tpt.Dialer),
} }
...@@ -69,7 +65,7 @@ func (t *QuicTransport) Listen(laddr ma.Multiaddr) (tpt.Listener, error) { ...@@ -69,7 +65,7 @@ func (t *QuicTransport) Listen(laddr ma.Multiaddr) (tpt.Listener, error) {
return l, nil return l, nil
} }
ln, err := newListener(laddr, t.peers, t) ln, err := newListener(laddr, t)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -11,7 +11,7 @@ var _ = Describe("Transport", func() { ...@@ -11,7 +11,7 @@ var _ = Describe("Transport", func() {
var t *QuicTransport var t *QuicTransport
BeforeEach(func() { BeforeEach(func() {
t = NewQuicTransport(nil) t = NewQuicTransport()
}) })
Context("listening", func() { Context("listening", func() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment