update quic-go to v0.20.0

libp2p · Mar 19, 2021 · a6b7fdf · a6b7fdf
1 parent fc9aa0e
commit a6b7fdf
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 69 deletions.
diff --git a/.github/workflows/matrix.jsonc b/.github/workflows/matrix.jsonc
@@ -8,6 +8,6 @@
   // v0.7.1 was never released in IPFS.
   { "go": "1.14", "commit": "v0.8.0", "retireBugBackwardsCompatiblityMode": true, "hasAcceptStreamBug": true },
   { "go": "1.15", "commit": "v0.8.0", "retireBugBackwardsCompatiblityMode": true, "hasAcceptStreamBug": true },
-  { "go": "1.14", "commit": "HEAD", "retireBugBackwardsCompatiblityMode": true, "hasAcceptStreamBug": false },
-  { "go": "1.15", "commit": "HEAD", "retireBugBackwardsCompatiblityMode": true, "hasAcceptStreamBug": false }
+  { "go": "1.15", "commit": "HEAD", "retireBugBackwardsCompatiblityMode": true, "hasAcceptStreamBug": false },
+  { "go": "1.16", "commit": "HEAD", "retireBugBackwardsCompatiblityMode": true, "hasAcceptStreamBug": false }
 ]
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -5,7 +5,7 @@ jobs:
     strategy:
       matrix:
         os: [ "ubuntu", "windows", "macos" ]
-        go: [ "1.14", "1.15" ]
+        go: [ "1.15.x", "1.16.x" ]
     runs-on: ${{ matrix.os }}-latest
     name: Unit tests (${{ matrix.os}}, Go ${{ matrix.go }})
     steps:

diff --git a/conn_test.go b/conn_test.go
@@ -195,7 +195,7 @@ var _ = Describe("Connection", func() {
 		// now allow the address and make sure the connection goes through
 		cg.EXPECT().InterceptAccept(gomock.Any()).Return(true)
 		cg.EXPECT().InterceptSecured(gomock.Any(), gomock.Any(), gomock.Any()).Return(true)
-		clientTransport.(*transport).clientConfig.HandshakeTimeout = 2 * time.Second
+		clientTransport.(*transport).clientConfig.HandshakeIdleTimeout = 2 * time.Second
 		conn, err = clientTransport.Dial(context.Background(), ln.Multiaddr(), serverID)
 		Expect(err).ToNot(HaveOccurred())
 		defer conn.Close()
@@ -221,7 +221,7 @@ var _ = Describe("Connection", func() {
 
 		// now allow the peerId and make sure the connection goes through
 		cg.EXPECT().InterceptSecured(gomock.Any(), gomock.Any(), gomock.Any()).Return(true)
-		clientTransport.(*transport).clientConfig.HandshakeTimeout = 2 * time.Second
+		clientTransport.(*transport).clientConfig.HandshakeIdleTimeout = 2 * time.Second
 		conn, err := clientTransport.Dial(context.Background(), ln.Multiaddr(), serverID)
 		Expect(err).ToNot(HaveOccurred())
 		conn.Close()

diff --git a/go.mod b/go.mod
@@ -1,15 +1,15 @@
 module github.com/libp2p/go-libp2p-quic-transport
 
-go 1.14
+go 1.15
 
 require (
-	github.com/golang/mock v1.4.4
+	github.com/golang/mock v1.5.0
 	github.com/ipfs/go-log v1.0.4
 	github.com/klauspost/compress v1.11.7
 	github.com/libp2p/go-libp2p-core v0.8.0
 	github.com/libp2p/go-libp2p-tls v0.1.3
 	github.com/libp2p/go-netroute v0.1.3
-	github.com/lucas-clemente/quic-go v0.19.3
+	github.com/lucas-clemente/quic-go v0.20.0
 	github.com/minio/sha256-simd v0.1.1
 	github.com/multiformats/go-multiaddr v0.3.1
 	github.com/multiformats/go-multiaddr-fmt v0.1.0

diff --git a/go.sum b/go.sum
diff --git a/listener.go b/listener.go
@@ -83,7 +83,7 @@ func (l *listener) setupConn(sess quic.Session) (*conn, error) {
 	// Since we don't have any way of knowing which tls.Config was used though,
 	// we have to re-determine the peer's identity here.
 	// Therefore, this is expected to never fail.
-	remotePubKey, err := p2ptls.PubKeyFromCertChain(sess.ConnectionState().PeerCertificates)
+	remotePubKey, err := p2ptls.PubKeyFromCertChain(sess.ConnectionState().TLS.PeerCertificates)
 	if err != nil {
 		return nil, err
 	}

diff --git a/mock_connection_gater_test.go b/mock_connection_gater_test.go
diff --git a/tracer.go b/tracer.go
@@ -10,14 +10,13 @@ import (
 	"github.com/klauspost/compress/zstd"
 
 	"github.com/lucas-clemente/quic-go/logging"
-	"github.com/lucas-clemente/quic-go/metrics"
 	"github.com/lucas-clemente/quic-go/qlog"
 )
 
 var tracer logging.Tracer
 
 func init() {
-	tracers := []logging.Tracer{metrics.NewTracer()}
+	tracers := []logging.Tracer{}
 	if qlogDir := os.Getenv("QLOGDIR"); len(qlogDir) > 0 {
 		if qlogger := initQlogger(qlogDir); qlogger != nil {
 			tracers = append(tracers, qlogger)

diff --git a/transport.go b/transport.go
@@ -30,10 +30,10 @@ var log = logging.Logger("quic-transport")
 var quicDialContext = quic.DialContext // so we can mock it in tests
 
 var quicConfig = &quic.Config{
-	MaxIncomingStreams:                    1000,
-	MaxIncomingUniStreams:                 -1,             // disable unidirectional streams
-	MaxReceiveStreamFlowControlWindow:     10 * (1 << 20), // 10 MB
-	MaxReceiveConnectionFlowControlWindow: 15 * (1 << 20), // 15 MB
+	MaxIncomingStreams:         1000,
+	MaxIncomingUniStreams:      -1,             // disable unidirectional streams
+	MaxStreamReceiveWindow:     10 * (1 << 20), // 10 MB
+	MaxConnectionReceiveWindow: 15 * (1 << 20), // 15 MB
 	AcceptToken: func(clientAddr net.Addr, _ *quic.Token) bool {
 		// TODO(#6): require source address validation when under load
 		return true