diff --git a/ackhandler/received_packet_history.go b/ackhandler/received_packet_history.go index 65968f3a..791dec17 100644 --- a/ackhandler/received_packet_history.go +++ b/ackhandler/received_packet_history.go @@ -2,9 +2,9 @@ package ackhandler import ( "github.com/lucas-clemente/quic-go/frames" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) type receivedPacketHistory struct { diff --git a/ackhandler/received_packet_history_test.go b/ackhandler/received_packet_history_test.go index 7d397475..212aa814 100644 --- a/ackhandler/received_packet_history_test.go +++ b/ackhandler/received_packet_history_test.go @@ -2,8 +2,8 @@ package ackhandler import ( "github.com/lucas-clemente/quic-go/frames" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/ackhandler/sent_packet_handler.go b/ackhandler/sent_packet_handler.go index 3a07972e..320f81a9 100644 --- a/ackhandler/sent_packet_handler.go +++ b/ackhandler/sent_packet_handler.go @@ -7,9 +7,9 @@ import ( "github.com/lucas-clemente/quic-go/congestion" "github.com/lucas-clemente/quic-go/frames" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) const ( diff --git a/client.go b/client.go index 3bf686f7..f1b68a34 100644 --- a/client.go +++ b/client.go @@ -9,9 +9,9 @@ import ( "sync" "time" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) type client struct { diff --git a/congestion/cubic_sender.go b/congestion/cubic_sender.go index 8982b87a..02e4206b 100644 --- a/congestion/cubic_sender.go +++ b/congestion/cubic_sender.go @@ -3,8 +3,8 @@ package congestion import ( "time" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) const ( diff --git a/congestion/hybrid_slow_start.go b/congestion/hybrid_slow_start.go index 179252b3..01a64f82 100644 --- a/congestion/hybrid_slow_start.go +++ b/congestion/hybrid_slow_start.go @@ -3,8 +3,8 @@ package congestion import ( "time" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) // Note(pwestin): the magic clamping numbers come from the original code in diff --git a/congestion/prr_sender.go b/congestion/prr_sender.go index 272f84ea..b8a0a10b 100644 --- a/congestion/prr_sender.go +++ b/congestion/prr_sender.go @@ -3,8 +3,8 @@ package congestion import ( "time" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) // PrrSender implements the Proportional Rate Reduction (PRR) per RFC 6937 diff --git a/congestion/prr_sender_test.go b/congestion/prr_sender_test.go index 61e6a17d..207ddf6c 100644 --- a/congestion/prr_sender_test.go +++ b/congestion/prr_sender_test.go @@ -4,8 +4,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) var _ = Describe("PRR sender", func() { diff --git a/crypto/key_derivation.go b/crypto/key_derivation.go index 33ca8235..accdbeaa 100644 --- a/crypto/key_derivation.go +++ b/crypto/key_derivation.go @@ -5,8 +5,8 @@ import ( "crypto/sha256" "io" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" "golang.org/x/crypto/hkdf" ) diff --git a/flowcontrol/flow_control_manager.go b/flowcontrol/flow_control_manager.go index a1043a00..5c8d5b7d 100644 --- a/flowcontrol/flow_control_manager.go +++ b/flowcontrol/flow_control_manager.go @@ -7,9 +7,9 @@ import ( "github.com/lucas-clemente/quic-go/congestion" "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) type flowControlManager struct { diff --git a/flowcontrol/flow_controller.go b/flowcontrol/flow_controller.go index a031ed54..387ee05b 100644 --- a/flowcontrol/flow_controller.go +++ b/flowcontrol/flow_controller.go @@ -6,8 +6,8 @@ import ( "github.com/lucas-clemente/quic-go/congestion" "github.com/lucas-clemente/quic-go/handshake" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) type flowController struct { diff --git a/frames/ack_frame.go b/frames/ack_frame.go index 42a8bfef..ceeba48c 100644 --- a/frames/ack_frame.go +++ b/frames/ack_frame.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) var ( diff --git a/frames/blocked_frame.go b/frames/blocked_frame.go index 7285e104..44645780 100644 --- a/frames/blocked_frame.go +++ b/frames/blocked_frame.go @@ -3,8 +3,8 @@ package frames import ( "bytes" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) // A BlockedFrame in QUIC diff --git a/frames/connection_close_frame.go b/frames/connection_close_frame.go index 9cfaf544..5a7ed04c 100644 --- a/frames/connection_close_frame.go +++ b/frames/connection_close_frame.go @@ -6,9 +6,9 @@ import ( "io" "math" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) // A ConnectionCloseFrame in QUIC diff --git a/frames/goaway_frame.go b/frames/goaway_frame.go index 4ea5a437..e00a6cf5 100644 --- a/frames/goaway_frame.go +++ b/frames/goaway_frame.go @@ -4,9 +4,9 @@ import ( "bytes" "io" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) // A GoawayFrame is a GOAWAY frame diff --git a/frames/log_test.go b/frames/log_test.go index 30959ad2..49a6c3d0 100644 --- a/frames/log_test.go +++ b/frames/log_test.go @@ -6,8 +6,8 @@ import ( "os" "time" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/frames/rst_stream_frame.go b/frames/rst_stream_frame.go index 72d02569..ea2531c6 100644 --- a/frames/rst_stream_frame.go +++ b/frames/rst_stream_frame.go @@ -3,8 +3,8 @@ package frames import ( "bytes" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) // A RstStreamFrame in QUIC diff --git a/frames/stop_waiting_frame.go b/frames/stop_waiting_frame.go index eb6798f2..91f937a8 100644 --- a/frames/stop_waiting_frame.go +++ b/frames/stop_waiting_frame.go @@ -4,9 +4,9 @@ import ( "bytes" "errors" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) // A StopWaitingFrame in QUIC diff --git a/frames/stream_frame.go b/frames/stream_frame.go index 3536147d..7dd62235 100644 --- a/frames/stream_frame.go +++ b/frames/stream_frame.go @@ -4,9 +4,9 @@ import ( "bytes" "errors" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) // A StreamFrame of QUIC diff --git a/frames/window_update_frame.go b/frames/window_update_frame.go index c1eb9bf0..9b8b4598 100644 --- a/frames/window_update_frame.go +++ b/frames/window_update_frame.go @@ -3,8 +3,8 @@ package frames import ( "bytes" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) // A WindowUpdateFrame in QUIC diff --git a/h2quic/client.go b/h2quic/client.go index d7b93c93..3ae14c88 100644 --- a/h2quic/client.go +++ b/h2quic/client.go @@ -15,9 +15,9 @@ import ( "golang.org/x/net/idna" quic "github.com/lucas-clemente/quic-go" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) type roundTripperOpts struct { diff --git a/h2quic/request_writer.go b/h2quic/request_writer.go index 455da6f6..dad591cc 100644 --- a/h2quic/request_writer.go +++ b/h2quic/request_writer.go @@ -13,8 +13,8 @@ import ( "golang.org/x/net/lex/httplex" quic "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) type requestWriter struct { diff --git a/h2quic/response_writer.go b/h2quic/response_writer.go index add157c8..24689346 100644 --- a/h2quic/response_writer.go +++ b/h2quic/response_writer.go @@ -8,8 +8,8 @@ import ( "sync" quic "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" "golang.org/x/net/http2" "golang.org/x/net/http2/hpack" ) diff --git a/h2quic/server.go b/h2quic/server.go index b998efb7..ae23762d 100644 --- a/h2quic/server.go +++ b/h2quic/server.go @@ -13,9 +13,9 @@ import ( "time" quic "github.com/lucas-clemente/quic-go" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" "golang.org/x/net/http2" "golang.org/x/net/http2/hpack" ) diff --git a/handshake/connection_parameters_manager.go b/handshake/connection_parameters_manager.go index 1127471b..c0b03011 100644 --- a/handshake/connection_parameters_manager.go +++ b/handshake/connection_parameters_manager.go @@ -5,9 +5,9 @@ import ( "sync" "time" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) // ConnectionParametersManager negotiates and stores the connection parameters diff --git a/handshake/crypto_setup_client.go b/handshake/crypto_setup_client.go index fd257abe..a8d88129 100644 --- a/handshake/crypto_setup_client.go +++ b/handshake/crypto_setup_client.go @@ -12,9 +12,9 @@ import ( "time" "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) type cryptoSetupClient struct { diff --git a/handshake/crypto_setup_client_test.go b/handshake/crypto_setup_client_test.go index 31053694..59678191 100644 --- a/handshake/crypto_setup_client_test.go +++ b/handshake/crypto_setup_client_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/handshake/crypto_setup_server.go b/handshake/crypto_setup_server.go index 4ba0b83a..f639f514 100644 --- a/handshake/crypto_setup_server.go +++ b/handshake/crypto_setup_server.go @@ -10,9 +10,9 @@ import ( "sync" "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) // KeyDerivationFunction is used for key derivation diff --git a/handshake/crypto_setup_server_test.go b/handshake/crypto_setup_server_test.go index c326de50..62f796b1 100644 --- a/handshake/crypto_setup_server_test.go +++ b/handshake/crypto_setup_server_test.go @@ -7,9 +7,9 @@ import ( "net" "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/handshake/ephermal_cache.go b/handshake/ephermal_cache.go index 608cf0d0..da6724f3 100644 --- a/handshake/ephermal_cache.go +++ b/handshake/ephermal_cache.go @@ -5,8 +5,8 @@ import ( "time" "github.com/lucas-clemente/quic-go/crypto" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) var ( diff --git a/handshake/handshake_message.go b/handshake/handshake_message.go index 804dcd02..0744cbdc 100644 --- a/handshake/handshake_message.go +++ b/handshake/handshake_message.go @@ -7,9 +7,9 @@ import ( "io" "sort" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) // A HandshakeMessage is a handshake message diff --git a/handshake/server_config_client.go b/handshake/server_config_client.go index 3de6f08e..42014195 100644 --- a/handshake/server_config_client.go +++ b/handshake/server_config_client.go @@ -8,8 +8,8 @@ import ( "time" "github.com/lucas-clemente/quic-go/crypto" - "github.com/lucas-clemente/quic-go/qerr" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/qerr" ) type serverConfigClient struct { diff --git a/integrationtests/handshake/rtt.go b/integrationtests/handshake/rtt.go index 33c7ff76..7767db6d 100644 --- a/integrationtests/handshake/rtt.go +++ b/integrationtests/handshake/rtt.go @@ -8,10 +8,10 @@ import ( quic "github.com/lucas-clemente/quic-go" "github.com/lucas-clemente/quic-go/integrationtests/proxy" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" "github.com/lucas-clemente/quic-go/testdata" - "github.com/lucas-clemente/quic-go/internal/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/integrationtests/integrationtests_suite_test.go b/integrationtests/integrationtests_suite_test.go index 4319fd15..3b764c57 100644 --- a/integrationtests/integrationtests_suite_test.go +++ b/integrationtests/integrationtests_suite_test.go @@ -22,9 +22,9 @@ import ( "time" "github.com/lucas-clemente/quic-go/h2quic" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/testdata" - "github.com/lucas-clemente/quic-go/internal/utils" "github.com/tebeka/selenium" . "github.com/onsi/ginkgo" diff --git a/public_header.go b/public_header.go index 80c81685..59ddc6cb 100644 --- a/public_header.go +++ b/public_header.go @@ -4,9 +4,9 @@ import ( "bytes" "errors" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) var ( diff --git a/public_reset.go b/public_reset.go index ae1bb4f3..958db9cc 100644 --- a/public_reset.go +++ b/public_reset.go @@ -6,8 +6,8 @@ import ( "errors" "github.com/lucas-clemente/quic-go/handshake" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) type publicReset struct { diff --git a/server.go b/server.go index c373e99a..0132edee 100644 --- a/server.go +++ b/server.go @@ -9,9 +9,9 @@ import ( "github.com/lucas-clemente/quic-go/crypto" "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) // packetHandler handles packets diff --git a/server_test.go b/server_test.go index 6d2892ad..acb8dece 100644 --- a/server_test.go +++ b/server_test.go @@ -10,9 +10,9 @@ import ( "github.com/lucas-clemente/quic-go/crypto" "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/session.go b/session.go index a11bfbb8..b4b80623 100644 --- a/session.go +++ b/session.go @@ -12,9 +12,9 @@ import ( "github.com/lucas-clemente/quic-go/flowcontrol" "github.com/lucas-clemente/quic-go/frames" "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/utils" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/internal/utils" ) type unpacker interface { diff --git a/stream.go b/stream.go index 72bbb591..6248abe3 100644 --- a/stream.go +++ b/stream.go @@ -7,8 +7,8 @@ import ( "github.com/lucas-clemente/quic-go/flowcontrol" "github.com/lucas-clemente/quic-go/frames" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) // A Stream assembles the data from StreamFrames and provides a super-convenient Read-Interface diff --git a/stream_frame_sorter.go b/stream_frame_sorter.go index f24324a1..4a50150e 100644 --- a/stream_frame_sorter.go +++ b/stream_frame_sorter.go @@ -4,8 +4,8 @@ import ( "errors" "github.com/lucas-clemente/quic-go/frames" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) type streamFrameSorter struct { diff --git a/stream_frame_sorter_test.go b/stream_frame_sorter_test.go index 1e0333a1..398729af 100644 --- a/stream_frame_sorter_test.go +++ b/stream_frame_sorter_test.go @@ -4,8 +4,8 @@ import ( "bytes" "github.com/lucas-clemente/quic-go/frames" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/stream_framer.go b/stream_framer.go index 6f6f14a3..2f41b538 100644 --- a/stream_framer.go +++ b/stream_framer.go @@ -3,8 +3,8 @@ package quic import ( "github.com/lucas-clemente/quic-go/flowcontrol" "github.com/lucas-clemente/quic-go/frames" - "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/protocol" ) type streamFramer struct {