Merge pull request #54 from libp2p/quic-go-0.11.0

update quic-go to v0.11.0
libp2p · Apr 4, 2019 · 6cca441 · 6cca441
2 parents 3dd3b2f + 9259704
commit 6cca441
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/p2p/transport/quic/conn_test.go b/p2p/transport/quic/conn_test.go
@@ -137,7 +137,7 @@ var _ = Describe("Connection", func() {
 		// dial, but expect the wrong peer ID
 		_, err = clientTransport.Dial(context.Background(), serverAddr, thirdPartyID)
 		Expect(err).To(HaveOccurred())
-		Expect(err.Error()).To(ContainSubstring("TLS handshake error: bad certificate"))
+		Expect(err.Error()).To(ContainSubstring("CRYPTO_ERROR"))
 		Consistently(serverConnChan).ShouldNot(Receive())
 	})
 
@@ -165,7 +165,7 @@ var _ = Describe("Connection", func() {
 		Expect(err).ToNot(HaveOccurred())
 		_, err = clientTransport.Dial(context.Background(), serverAddr, serverID)
 		Expect(err).To(HaveOccurred())
-		Expect(err.Error()).To(ContainSubstring("TLS handshake error: bad certificate"))
+		Expect(err.Error()).To(ContainSubstring("CRYPTO_ERROR"))
 		Consistently(serverConnChan).ShouldNot(Receive())
 	})
 

diff --git a/p2p/transport/quic/stream.go b/p2p/transport/quic/stream.go
@@ -12,8 +12,7 @@ type stream struct {
 var _ smux.Stream = &stream{}
 
 func (s *stream) Reset() error {
-	if err := s.Stream.CancelRead(0); err != nil {
-		return err
-	}
-	return s.Stream.CancelWrite(0)
+	s.Stream.CancelRead(0)
+	s.Stream.CancelWrite(0)
+	return nil
 }
diff --git a/p2p/transport/quic/transport.go b/p2p/transport/quic/transport.go
@@ -19,7 +19,6 @@ import (
 )
 
 var quicConfig = &quic.Config{
-	Versions:                              []quic.VersionNumber{quic.VersionMilestone0_10_0},
 	MaxIncomingStreams:                    1000,
 	MaxIncomingUniStreams:                 -1,              // disable unidirectional streams
 	MaxReceiveStreamFlowControlWindow:     3 * (1 << 20),   // 3 MB