Skip to content
This repository has been archived by the owner on May 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #182 from libp2p/update-quic-go
Browse files Browse the repository at this point in the history 
update quic-go to v0.19.1
  • Loading branch information
@marten-seemann
marten-seemann authored Nov 14, 2020
2 parents 7d08b26 + 6935117 commit 8a34d49
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/interop.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,5 @@ jobs:
- name: 'Run test case: multi-transfer'
# Longer transfers might fail if the version has the connection ID retirement bug, see https://github.com/ipfs/go-ipfs/issues/7526.
# The busy-looping bug might prevent all streams from being opened, see https://github.com/lucas-clemente/quic-go/pull/2827.
if: ${{ !matrix.client.hasOpenStreamBug && (matrix.client.retireBugBackwardsCompatiblityMode || matrix.server.retireBugBackwardsCompatiblityMode) }}
if: ${{ !matrix.server.hasAcceptStreamBug && (matrix.client.retireBugBackwardsCompatiblityMode || matrix.server.retireBugBackwardsCompatiblityMode) }}
run: cd interop && ../.github/workflows/interop.sh transport-go${{ matrix.server.go }}-${{ matrix.server.commit }} transport-go${{ matrix.client.go }}-${{ matrix.client.commit }} multi-transfer
20 changes: 10 additions & 10 deletions .github/workflows/matrix.jsonc
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[
{ "go": "1.13", "commit": "v0.6.0", "retireBugBackwardsCompatiblityMode": false, "hasOpenStreamBug": true },
{ "go": "1.14", "commit": "v0.6.0", "retireBugBackwardsCompatiblityMode": false, "hasOpenStreamBug": true },
{ "go": "1.13", "commit": "v0.7.0", "retireBugBackwardsCompatiblityMode": false, "hasOpenStreamBug": true },
{ "go": "1.14", "commit": "v0.7.0", "retireBugBackwardsCompatiblityMode": false, "hasOpenStreamBug": true},
{ "go": "1.13", "commit": "v0.7.1", "retireBugBackwardsCompatiblityMode": true, "hasOpenStreamBug": true },
{ "go": "1.14", "commit": "v0.7.1", "retireBugBackwardsCompatiblityMode": true, "hasOpenStreamBug": true },
{ "go": "1.13", "commit": "v0.6.0", "retireBugBackwardsCompatiblityMode": false, "hasAcceptStreamBug": true },
{ "go": "1.14", "commit": "v0.6.0", "retireBugBackwardsCompatiblityMode": false, "hasAcceptStreamBug": true },
{ "go": "1.13", "commit": "v0.7.0", "retireBugBackwardsCompatiblityMode": false, "hasAcceptStreamBug": true },
{ "go": "1.14", "commit": "v0.7.0", "retireBugBackwardsCompatiblityMode": false, "hasAcceptStreamBug": true},
{ "go": "1.13", "commit": "v0.7.1", "retireBugBackwardsCompatiblityMode": true, "hasAcceptStreamBug": true },
{ "go": "1.14", "commit": "v0.7.1", "retireBugBackwardsCompatiblityMode": true, "hasAcceptStreamBug": true },
// v0.7.1 was never released in IPFS.
{ "go": "1.14", "commit": "v0.8.0", "retireBugBackwardsCompatiblityMode": true, "hasOpenStreamBug": true },
{ "go": "1.15", "commit": "v0.8.0", "retireBugBackwardsCompatiblityMode": true, "hasOpenStreamBug": true },
{ "go": "1.14", "commit": "HEAD", "retireBugBackwardsCompatiblityMode": true, "hasOpenStreamBug": true },
{ "go": "1.15", "commit": "HEAD", "retireBugBackwardsCompatiblityMode": true, "hasOpenStreamBug": true }
{ "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 }
]
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/libp2p/go-libp2p-core v0.7.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.18.1
github.com/lucas-clemente/quic-go v0.19.1
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
Expand Down
10 changes: 5 additions & 5 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,15 @@ github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGN
github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
github.com/libp2p/go-sockaddr v0.0.2 h1:tCuXfpA9rq7llM/v834RKc/Xvovy/AqM9kHvTV/jY/Q=
github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
github.com/lucas-clemente/quic-go v0.18.1 h1:DMR7guC0NtVS8zNZR3IO7NARZvZygkSC56GGtC6cyys=
github.com/lucas-clemente/quic-go v0.18.1/go.mod h1:yXttHsSNxQi8AWijC/vLP+OJczXqzHSOcJrM5ITUlCg=
github.com/lucas-clemente/quic-go v0.19.1 h1:J9TkQJGJVOR3UmGhd4zdVYwKSA0EoXbLRf15uQJ6gT4=
github.com/lucas-clemente/quic-go v0.19.1/go.mod h1:ZUygOqIoai0ASXXLJ92LTnKdbqh9MHCLTX6Nr1jUrK0=
github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/marten-seemann/qpack v0.2.0/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
github.com/marten-seemann/qtls v0.10.0 h1:ECsuYUKalRL240rRD4Ri33ISb7kAQ3qGDlrrl55b2pc=
github.com/marten-seemann/qtls v0.10.0/go.mod h1:UvMd1oaYDACI99/oZUYLzMCkBXQVT0aGm99sJhbT8hs=
github.com/marten-seemann/qtls-go1-15 v0.1.0 h1:i/YPXVxz8q9umso/5y474CNcHmTpA+5DH+mFPjx6PZg=
github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-15 v0.1.1 h1:LIH6K34bPVttyXnUWixk0bzH6/N07VxbSabxn5A5gZQ=
github.com/marten-seemann/qtls-go1-15 v0.1.1/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
Expand Down
5 changes: 3 additions & 2 deletions integrationtests/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"fmt"
"io/ioutil"
"log"
"strings"
"time"

"github.com/libp2p/go-libp2p-core/crypto"
Expand Down Expand Up @@ -242,8 +243,8 @@ func testHandshakeFailure(tr transport.Transport, serverKey crypto.PubKey, addr
if err == nil {
return errors.New("expected the handshake to fail")
}
if err.Error() != "CRYPTO_ERROR: peer IDs don't match" {
return fmt.Errorf("got unexpected error: %s", err.Error())
if !strings.Contains(err.Error(), "CRYPTO_ERROR") || !strings.Contains(err.Error(), "peer IDs don't match") {
return fmt.Errorf("got unexpected error: %w", err)
}
return nil
}
1 change: 1 addition & 0 deletions transport.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ var quicConfig = &quic.Config{
return true
},
KeepAlive: true,
Versions: []quic.VersionNumber{quic.VersionDraft29, quic.VersionDraft32},
}

const statelessResetKeyInfo = "libp2p quic stateless reset key"
Expand Down

0 comments on commit 8a34d49

Please sign in to comment.