From 3ea7c580f2830b6c28ccf826d1d39efaf6b330ea Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Thu, 2 Feb 2023 14:54:51 +1300 Subject: [PATCH] use quic-go and webtransport-go from quic-go organization --- config/quic_stateless_reset.go | 2 +- go.mod | 15 +++++----- go.sum | 30 ++++++++++--------- p2p/net/swarm/swarm_dial.go | 3 +- p2p/transport/quic/conn.go | 2 +- p2p/transport/quic/conn_test.go | 7 ++--- p2p/transport/quic/listener.go | 2 +- p2p/transport/quic/stream.go | 2 +- p2p/transport/quic/transport.go | 8 ++--- p2p/transport/quic/virtuallistener.go | 3 +- p2p/transport/quicreuse/config.go | 2 +- p2p/transport/quicreuse/connmgr.go | 4 +-- p2p/transport/quicreuse/connmgr_test.go | 4 +-- p2p/transport/quicreuse/listener.go | 2 +- p2p/transport/quicreuse/quic_multiaddr.go | 2 +- .../quicreuse/quic_multiaddr_test.go | 2 +- p2p/transport/quicreuse/tracer.go | 4 +-- p2p/transport/quicreuse/tracer_metrics.go | 5 ++-- p2p/transport/quicreuse/tracer_test.go | 6 ++-- .../webtransport/cert_manager_test.go | 3 +- p2p/transport/webtransport/conn.go | 2 +- p2p/transport/webtransport/crypto.go | 5 ++-- p2p/transport/webtransport/listener.go | 2 +- .../webtransport/noise_early_data.go | 3 +- p2p/transport/webtransport/stream.go | 4 +-- p2p/transport/webtransport/transport.go | 6 ++-- p2p/transport/webtransport/transport_test.go | 12 ++++---- 27 files changed, 68 insertions(+), 74 deletions(-) diff --git a/config/quic_stateless_reset.go b/config/quic_stateless_reset.go index 3cbb6970ac..a12be56f5b 100644 --- a/config/quic_stateless_reset.go +++ b/config/quic_stateless_reset.go @@ -8,7 +8,7 @@ import ( "github.com/libp2p/go-libp2p/core/crypto" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) const statelessResetKeyInfo = "libp2p quic stateless reset key" diff --git a/go.mod b/go.mod index a7835981e3..f2d08664a7 100644 --- a/go.mod +++ b/go.mod @@ -29,9 +29,7 @@ require ( github.com/libp2p/go-reuseport v0.2.0 github.com/libp2p/go-yamux/v4 v4.0.0 github.com/libp2p/zeroconf/v2 v2.2.0 - github.com/lucas-clemente/quic-go v0.31.1 github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd - github.com/marten-seemann/webtransport-go v0.4.3 github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b github.com/minio/sha256-simd v1.0.0 github.com/mr-tron/base58 v1.2.0 @@ -46,12 +44,14 @@ require ( github.com/multiformats/go-varint v0.0.7 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 github.com/prometheus/client_golang v1.14.0 + github.com/quic-go/quic-go v0.32.0 + github.com/quic-go/webtransport-go v0.5.0 github.com/raulk/go-watchdog v1.3.0 github.com/stretchr/testify v1.8.1 go.opencensus.io v0.24.0 go.uber.org/fx v1.18.2 go.uber.org/goleak v1.1.12 - golang.org/x/crypto v0.3.0 + golang.org/x/crypto v0.4.0 golang.org/x/sync v0.1.0 golang.org/x/sys v0.3.0 golang.org/x/tools v0.3.0 @@ -86,9 +86,6 @@ require ( github.com/klauspost/cpuid/v2 v2.2.1 // indirect github.com/koron/go-ssdp v0.0.3 // indirect github.com/libp2p/go-cidranger v1.1.0 // indirect - github.com/marten-seemann/qpack v0.3.0 // indirect - github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect - github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect github.com/mattn/go-isatty v0.0.16 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/miekg/dns v1.1.50 // indirect @@ -102,6 +99,10 @@ require ( github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect + github.com/quic-go/qpack v0.4.0 // indirect + github.com/quic-go/qtls-go1-18 v0.2.0 // indirect + github.com/quic-go/qtls-go1-19 v0.2.0 // indirect + github.com/quic-go/qtls-go1-20 v0.1.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/syndtr/goleveldb v1.0.0 // indirect go.uber.org/atomic v1.10.0 // indirect @@ -110,7 +111,7 @@ require ( go.uber.org/zap v1.24.0 // indirect golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect golang.org/x/mod v0.7.0 // indirect - golang.org/x/net v0.3.0 // indirect + golang.org/x/net v0.4.0 // indirect golang.org/x/text v0.5.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.1.7 // indirect diff --git a/go.sum b/go.sum index 89d7b78c30..fba0b21dde 100644 --- a/go.sum +++ b/go.sum @@ -319,21 +319,11 @@ github.com/libp2p/go-yamux/v4 v4.0.0 h1:+Y80dV2Yx/kv7Y7JKu0LECyVdMXm1VUoko+VQ9rB github.com/libp2p/go-yamux/v4 v4.0.0/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4= github.com/libp2p/zeroconf/v2 v2.2.0 h1:Cup06Jv6u81HLhIj1KasuNM/RHHrJ8T7wOTS4+Tv53Q= github.com/libp2p/zeroconf/v2 v2.2.0/go.mod h1:fuJqLnUwZTshS3U/bMRJ3+ow/v9oid1n0DmyYyNO1Xs= -github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4= -github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE= -github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g= -github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDAl7TTQf5h7TI= -github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= -github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE= -github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk= github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU= -github.com/marten-seemann/webtransport-go v0.4.3 h1:vkt5o/Ci+luknRteWdYGYH1KcB7ziup+J+1PzZJIvmg= -github.com/marten-seemann/webtransport-go v0.4.3/go.mod h1:4xcfySgZMLP4aG5GBGj1egP7NlpfwgYJ1WJMvPPiVMU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -448,6 +438,18 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= +github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= +github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U= +github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc= +github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk= +github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= +github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI= +github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= +github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA= +github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo= +github.com/quic-go/webtransport-go v0.5.0 h1:vVKcXSg9GM/OsNKHcKYWjjYUPg+/hVkPT6bLll4N7zI= +github.com/quic-go/webtransport-go v0.5.0/go.mod h1:OhmmgJIzTTqXK5xvtuX0oBpLV2GkLWNDA+UeTGJXErU= github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk= github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -560,8 +562,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= +golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -643,8 +645,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.3.0 h1:VWL6FNY2bEEmsGVKabSlHu5Irp34xmMRoqb/9lF9lxk= -golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= diff --git a/p2p/net/swarm/swarm_dial.go b/p2p/net/swarm/swarm_dial.go index 01b955e865..4c64e37b61 100644 --- a/p2p/net/swarm/swarm_dial.go +++ b/p2p/net/swarm/swarm_dial.go @@ -12,11 +12,10 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/peerstore" "github.com/libp2p/go-libp2p/core/transport" - "github.com/lucas-clemente/quic-go" - ma "github.com/multiformats/go-multiaddr" madns "github.com/multiformats/go-multiaddr-dns" manet "github.com/multiformats/go-multiaddr/net" + "github.com/quic-go/quic-go" ) // The maximum number of address resolution steps we'll perform for a single diff --git a/p2p/transport/quic/conn.go b/p2p/transport/quic/conn.go index 261e19a2d1..1154cf72d4 100644 --- a/p2p/transport/quic/conn.go +++ b/p2p/transport/quic/conn.go @@ -8,8 +8,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" tpt "github.com/libp2p/go-libp2p/core/transport" - "github.com/lucas-clemente/quic-go" ma "github.com/multiformats/go-multiaddr" + "github.com/quic-go/quic-go" ) type conn struct { diff --git a/p2p/transport/quic/conn_test.go b/p2p/transport/quic/conn_test.go index 6a9d5e9771..6929458706 100644 --- a/p2p/transport/quic/conn_test.go +++ b/p2p/transport/quic/conn_test.go @@ -13,18 +13,17 @@ import ( "testing" "time" - "github.com/libp2p/go-libp2p/p2p/transport/quicreuse" - ic "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/network" mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks" "github.com/libp2p/go-libp2p/core/peer" tpt "github.com/libp2p/go-libp2p/core/transport" + "github.com/libp2p/go-libp2p/p2p/transport/quicreuse" "github.com/golang/mock/gomock" - "github.com/lucas-clemente/quic-go" - quicproxy "github.com/lucas-clemente/quic-go/integrationtests/tools/proxy" ma "github.com/multiformats/go-multiaddr" + "github.com/quic-go/quic-go" + quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" "github.com/stretchr/testify/require" ) diff --git a/p2p/transport/quic/listener.go b/p2p/transport/quic/listener.go index 9c00026f78..78fd001186 100644 --- a/p2p/transport/quic/listener.go +++ b/p2p/transport/quic/listener.go @@ -12,8 +12,8 @@ import ( p2ptls "github.com/libp2p/go-libp2p/p2p/security/tls" "github.com/libp2p/go-libp2p/p2p/transport/quicreuse" - "github.com/lucas-clemente/quic-go" ma "github.com/multiformats/go-multiaddr" + "github.com/quic-go/quic-go" ) // A listener listens for QUIC connections. diff --git a/p2p/transport/quic/stream.go b/p2p/transport/quic/stream.go index 5d276dab80..56f12dade2 100644 --- a/p2p/transport/quic/stream.go +++ b/p2p/transport/quic/stream.go @@ -5,7 +5,7 @@ import ( "github.com/libp2p/go-libp2p/core/network" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) const ( diff --git a/p2p/transport/quic/transport.go b/p2p/transport/quic/transport.go index cc967e16c2..3a082243ca 100644 --- a/p2p/transport/quic/transport.go +++ b/p2p/transport/quic/transport.go @@ -10,8 +10,6 @@ import ( "sync" "time" - manet "github.com/multiformats/go-multiaddr/net" - "github.com/libp2p/go-libp2p/core/connmgr" ic "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/network" @@ -21,11 +19,11 @@ import ( p2ptls "github.com/libp2p/go-libp2p/p2p/security/tls" "github.com/libp2p/go-libp2p/p2p/transport/quicreuse" + logging "github.com/ipfs/go-log/v2" ma "github.com/multiformats/go-multiaddr" mafmt "github.com/multiformats/go-multiaddr-fmt" - - logging "github.com/ipfs/go-log/v2" - "github.com/lucas-clemente/quic-go" + manet "github.com/multiformats/go-multiaddr/net" + "github.com/quic-go/quic-go" ) var log = logging.Logger("quic-transport") diff --git a/p2p/transport/quic/virtuallistener.go b/p2p/transport/quic/virtuallistener.go index a95b857dde..edefcf1d0f 100644 --- a/p2p/transport/quic/virtuallistener.go +++ b/p2p/transport/quic/virtuallistener.go @@ -6,8 +6,9 @@ import ( tpt "github.com/libp2p/go-libp2p/core/transport" "github.com/libp2p/go-libp2p/p2p/transport/quicreuse" - "github.com/lucas-clemente/quic-go" + ma "github.com/multiformats/go-multiaddr" + "github.com/quic-go/quic-go" ) const acceptBufferPerVersion = 4 diff --git a/p2p/transport/quicreuse/config.go b/p2p/transport/quicreuse/config.go index 1bd90821eb..a57cbd13ac 100644 --- a/p2p/transport/quicreuse/config.go +++ b/p2p/transport/quicreuse/config.go @@ -4,7 +4,7 @@ import ( "net" "time" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" ) var quicConfig = &quic.Config{ diff --git a/p2p/transport/quicreuse/connmgr.go b/p2p/transport/quicreuse/connmgr.go index 36fdb582c0..f9d2d026db 100644 --- a/p2p/transport/quicreuse/connmgr.go +++ b/p2p/transport/quicreuse/connmgr.go @@ -7,10 +7,10 @@ import ( "net" "sync" - "github.com/lucas-clemente/quic-go" - quiclogging "github.com/lucas-clemente/quic-go/logging" ma "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" + "github.com/quic-go/quic-go" + quiclogging "github.com/quic-go/quic-go/logging" ) var quicDialContext = quic.DialContext // so we can mock it in tests diff --git a/p2p/transport/quicreuse/connmgr_test.go b/p2p/transport/quicreuse/connmgr_test.go index a130bb2d1c..16677c50fe 100644 --- a/p2p/transport/quicreuse/connmgr_test.go +++ b/p2p/transport/quicreuse/connmgr_test.go @@ -14,10 +14,8 @@ import ( "github.com/libp2p/go-libp2p/core/peer" libp2ptls "github.com/libp2p/go-libp2p/p2p/security/tls" - "github.com/lucas-clemente/quic-go" - ma "github.com/multiformats/go-multiaddr" - + "github.com/quic-go/quic-go" "github.com/stretchr/testify/require" ) diff --git a/p2p/transport/quicreuse/listener.go b/p2p/transport/quicreuse/listener.go index b71478fd50..5f219fc65e 100644 --- a/p2p/transport/quicreuse/listener.go +++ b/p2p/transport/quicreuse/listener.go @@ -9,8 +9,8 @@ import ( "net" "sync" - "github.com/lucas-clemente/quic-go" ma "github.com/multiformats/go-multiaddr" + "github.com/quic-go/quic-go" ) var quicListen = quic.Listen // so we can mock it in tests diff --git a/p2p/transport/quicreuse/quic_multiaddr.go b/p2p/transport/quicreuse/quic_multiaddr.go index afd8fbb779..12eb7d8ab9 100644 --- a/p2p/transport/quicreuse/quic_multiaddr.go +++ b/p2p/transport/quicreuse/quic_multiaddr.go @@ -4,9 +4,9 @@ import ( "errors" "net" - "github.com/lucas-clemente/quic-go" ma "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" + "github.com/quic-go/quic-go" ) var ( diff --git a/p2p/transport/quicreuse/quic_multiaddr_test.go b/p2p/transport/quicreuse/quic_multiaddr_test.go index fa18a72836..23a8b0babd 100644 --- a/p2p/transport/quicreuse/quic_multiaddr_test.go +++ b/p2p/transport/quicreuse/quic_multiaddr_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/lucas-clemente/quic-go" ma "github.com/multiformats/go-multiaddr" + "github.com/quic-go/quic-go" "github.com/stretchr/testify/require" ) diff --git a/p2p/transport/quicreuse/tracer.go b/p2p/transport/quicreuse/tracer.go index f7a8767ae4..46a683cbce 100644 --- a/p2p/transport/quicreuse/tracer.go +++ b/p2p/transport/quicreuse/tracer.go @@ -9,8 +9,8 @@ import ( golog "github.com/ipfs/go-log/v2" "github.com/klauspost/compress/zstd" - "github.com/lucas-clemente/quic-go/logging" - "github.com/lucas-clemente/quic-go/qlog" + "github.com/quic-go/quic-go/logging" + "github.com/quic-go/quic-go/qlog" ) var log = golog.Logger("quic-utils") diff --git a/p2p/transport/quicreuse/tracer_metrics.go b/p2p/transport/quicreuse/tracer_metrics.go index 3282b74715..68a905ec41 100644 --- a/p2p/transport/quicreuse/tracer_metrics.go +++ b/p2p/transport/quicreuse/tracer_metrics.go @@ -9,9 +9,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/logging" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/logging" ) var ( diff --git a/p2p/transport/quicreuse/tracer_test.go b/p2p/transport/quicreuse/tracer_test.go index 6c8ee2ed1d..c5b5a9833b 100644 --- a/p2p/transport/quicreuse/tracer_test.go +++ b/p2p/transport/quicreuse/tracer_test.go @@ -7,11 +7,9 @@ import ( "strings" "testing" - "github.com/stretchr/testify/require" - "github.com/klauspost/compress/zstd" - - "github.com/lucas-clemente/quic-go/logging" + "github.com/quic-go/quic-go/logging" + "github.com/stretchr/testify/require" ) func createLogDir(t *testing.T) string { diff --git a/p2p/transport/webtransport/cert_manager_test.go b/p2p/transport/webtransport/cert_manager_test.go index 4b4550bb9d..29999a8fe0 100644 --- a/p2p/transport/webtransport/cert_manager_test.go +++ b/p2p/transport/webtransport/cert_manager_test.go @@ -8,9 +8,10 @@ import ( "testing/quick" "time" - "github.com/benbjohnson/clock" "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/test" + + "github.com/benbjohnson/clock" ma "github.com/multiformats/go-multiaddr" "github.com/multiformats/go-multibase" "github.com/multiformats/go-multihash" diff --git a/p2p/transport/webtransport/conn.go b/p2p/transport/webtransport/conn.go index 1041b83e5b..5815d9b6a4 100644 --- a/p2p/transport/webtransport/conn.go +++ b/p2p/transport/webtransport/conn.go @@ -6,8 +6,8 @@ import ( "github.com/libp2p/go-libp2p/core/network" tpt "github.com/libp2p/go-libp2p/core/transport" - "github.com/marten-seemann/webtransport-go" ma "github.com/multiformats/go-multiaddr" + "github.com/quic-go/webtransport-go" ) type connSecurityMultiaddrs struct { diff --git a/p2p/transport/webtransport/crypto.go b/p2p/transport/webtransport/crypto.go index d988625669..bdc121c52a 100644 --- a/p2p/transport/webtransport/crypto.go +++ b/p2p/transport/webtransport/crypto.go @@ -15,11 +15,12 @@ import ( "math/big" "time" + "golang.org/x/crypto/hkdf" + ic "github.com/libp2p/go-libp2p/core/crypto" - "github.com/lucas-clemente/quic-go/http3" "github.com/multiformats/go-multihash" - "golang.org/x/crypto/hkdf" + "github.com/quic-go/quic-go/http3" ) const deterministicCertInfo = "determinisitic cert" diff --git a/p2p/transport/webtransport/listener.go b/p2p/transport/webtransport/listener.go index 7fb66dda9d..4722e00811 100644 --- a/p2p/transport/webtransport/listener.go +++ b/p2p/transport/webtransport/listener.go @@ -14,8 +14,8 @@ import ( "github.com/libp2p/go-libp2p/p2p/security/noise/pb" "github.com/libp2p/go-libp2p/p2p/transport/quicreuse" - "github.com/marten-seemann/webtransport-go" ma "github.com/multiformats/go-multiaddr" + "github.com/quic-go/webtransport-go" ) var errClosed = errors.New("closed") diff --git a/p2p/transport/webtransport/noise_early_data.go b/p2p/transport/webtransport/noise_early_data.go index dfab2777d7..6ca8d9ddb7 100644 --- a/p2p/transport/webtransport/noise_early_data.go +++ b/p2p/transport/webtransport/noise_early_data.go @@ -4,10 +4,9 @@ import ( "context" "net" - "github.com/libp2p/go-libp2p/p2p/security/noise/pb" - "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/p2p/security/noise" + "github.com/libp2p/go-libp2p/p2p/security/noise/pb" ) type earlyDataHandler struct { diff --git a/p2p/transport/webtransport/stream.go b/p2p/transport/webtransport/stream.go index 623fc6036f..0849fc9f38 100644 --- a/p2p/transport/webtransport/stream.go +++ b/p2p/transport/webtransport/stream.go @@ -4,9 +4,9 @@ import ( "errors" "net" - "github.com/marten-seemann/webtransport-go" - "github.com/libp2p/go-libp2p/core/network" + + "github.com/quic-go/webtransport-go" ) const ( diff --git a/p2p/transport/webtransport/transport.go b/p2p/transport/webtransport/transport.go index eae3772d33..aef58a28c5 100644 --- a/p2p/transport/webtransport/transport.go +++ b/p2p/transport/webtransport/transport.go @@ -23,12 +23,12 @@ import ( "github.com/benbjohnson/clock" logging "github.com/ipfs/go-log/v2" - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/http3" - "github.com/marten-seemann/webtransport-go" ma "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" "github.com/multiformats/go-multihash" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/http3" + "github.com/quic-go/webtransport-go" ) var log = logging.Logger("webtransport") diff --git a/p2p/transport/webtransport/transport_test.go b/p2p/transport/webtransport/transport_test.go index 628bdf9fe0..fe1807797e 100644 --- a/p2p/transport/webtransport/transport_test.go +++ b/p2p/transport/webtransport/transport_test.go @@ -18,26 +18,24 @@ import ( "testing/quick" "time" - "github.com/lucas-clemente/quic-go/http3" - - "github.com/libp2p/go-libp2p/p2p/transport/quicreuse" - - "github.com/benbjohnson/clock" ic "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/network" mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks" "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/test" tpt "github.com/libp2p/go-libp2p/core/transport" + "github.com/libp2p/go-libp2p/p2p/transport/quicreuse" libp2pwebtransport "github.com/libp2p/go-libp2p/p2p/transport/webtransport" - "github.com/lucas-clemente/quic-go" + "github.com/benbjohnson/clock" "github.com/golang/mock/gomock" - quicproxy "github.com/lucas-clemente/quic-go/integrationtests/tools/proxy" ma "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" "github.com/multiformats/go-multibase" "github.com/multiformats/go-multihash" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/http3" + quicproxy "github.com/quic-go/quic-go/integrationtests/tools/proxy" "github.com/stretchr/testify/require" )