diff --git a/p2p/transport/quic/conn_test.go b/p2p/transport/quic/conn_test.go index 8c74837aed..67d48e79a1 100644 --- a/p2p/transport/quic/conn_test.go +++ b/p2p/transport/quic/conn_test.go @@ -20,7 +20,7 @@ import ( quicproxy "github.com/lucas-clemente/quic-go/integrationtests/tools/proxy" ma "github.com/multiformats/go-multiaddr" - manet "github.com/multiformats/go-multiaddr-net" + manet "github.com/multiformats/go-multiaddr/net" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -303,7 +303,7 @@ var _ = Describe("Connection", func() { defer GinkgoRecover() str, err := conn.AcceptStream() Expect(err).ToNot(HaveOccurred()) - str.Close() + str.CloseWrite() d, err := ioutil.ReadAll(str) Expect(err).ToNot(HaveOccurred()) Expect(d).To(Equal(data)) diff --git a/p2p/transport/quic/quic_multiaddr.go b/p2p/transport/quic/quic_multiaddr.go index 8b182b76ba..81b66af8aa 100644 --- a/p2p/transport/quic/quic_multiaddr.go +++ b/p2p/transport/quic/quic_multiaddr.go @@ -4,7 +4,7 @@ import ( "net" ma "github.com/multiformats/go-multiaddr" - manet "github.com/multiformats/go-multiaddr-net" + manet "github.com/multiformats/go-multiaddr/net" ) var quicMA ma.Multiaddr diff --git a/p2p/transport/quic/stream.go b/p2p/transport/quic/stream.go index 313ea227ec..57ca2e9155 100644 --- a/p2p/transport/quic/stream.go +++ b/p2p/transport/quic/stream.go @@ -38,4 +38,18 @@ func (s *stream) Reset() error { return nil } +func (s *stream) Close() error { + s.Stream.CancelRead(reset) + return s.Stream.Close() +} + +func (s *stream) CloseRead() error { + s.Stream.CancelRead(reset) + return nil +} + +func (s *stream) CloseWrite() error { + return s.Stream.Close() +} + var _ mux.MuxedStream = &stream{} diff --git a/p2p/transport/quic/transport.go b/p2p/transport/quic/transport.go index 17b8e60590..25d0e8a088 100644 --- a/p2p/transport/quic/transport.go +++ b/p2p/transport/quic/transport.go @@ -22,7 +22,7 @@ import ( quic "github.com/lucas-clemente/quic-go" ma "github.com/multiformats/go-multiaddr" mafmt "github.com/multiformats/go-multiaddr-fmt" - manet "github.com/multiformats/go-multiaddr-net" + manet "github.com/multiformats/go-multiaddr/net" ) var log = logging.Logger("quic-transport")