From ed522ebbcebf65a29febc83c21780b2d5418a7ea Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Tue, 29 Aug 2017 23:51:56 +0700 Subject: [PATCH] make wire an internal package --- ackhandler/interfaces.go | 2 +- ackhandler/packet.go | 2 +- ackhandler/packet_test.go | 2 +- ackhandler/received_packet_handler.go | 2 +- ackhandler/received_packet_handler_test.go | 2 +- ackhandler/received_packet_history.go | 2 +- ackhandler/received_packet_history_test.go | 2 +- ackhandler/retransmittable.go | 2 +- ackhandler/retransmittable_test.go | 2 +- ackhandler/sent_packet_handler.go | 2 +- ackhandler/sent_packet_handler_test.go | 2 +- ackhandler/stop_waiting_manager.go | 2 +- ackhandler/stop_waiting_manager_test.go | 2 +- client.go | 2 +- client_test.go | 2 +- integrationtests/tools/proxy/proxy.go | 2 +- integrationtests/tools/proxy/proxy_test.go | 2 +- {wire => internal/wire}/ack_frame.go | 0 {wire => internal/wire}/ack_frame_test.go | 0 {wire => internal/wire}/ack_range.go | 0 {wire => internal/wire}/blocked_frame.go | 0 {wire => internal/wire}/blocked_frame_test.go | 0 {wire => internal/wire}/connection_close_frame.go | 0 {wire => internal/wire}/connection_close_frame_test.go | 0 {wire => internal/wire}/frame.go | 0 {wire => internal/wire}/goaway_frame.go | 0 {wire => internal/wire}/goaway_frame_test.go | 0 {wire => internal/wire}/log.go | 0 {wire => internal/wire}/log_test.go | 0 {wire => internal/wire}/ping_frame.go | 0 {wire => internal/wire}/ping_frame_test.go | 0 {wire => internal/wire}/public_header.go | 0 {wire => internal/wire}/public_header_test.go | 0 {wire => internal/wire}/rst_stream_frame.go | 0 {wire => internal/wire}/rst_stream_frame_test.go | 0 {wire => internal/wire}/stop_waiting_frame.go | 0 {wire => internal/wire}/stop_waiting_frame_test.go | 0 {wire => internal/wire}/stream_frame.go | 0 {wire => internal/wire}/stream_frame_test.go | 0 {wire => internal/wire}/version_negotiation.go | 0 {wire => internal/wire}/version_negotiation_test.go | 0 {wire => internal/wire}/window_update_frame.go | 0 {wire => internal/wire}/window_update_frame_test.go | 0 {wire => internal/wire}/wire_suite_test.go | 0 packet_packer.go | 2 +- packet_packer_test.go | 2 +- packet_unpacker.go | 2 +- packet_unpacker_test.go | 2 +- server.go | 2 +- server_test.go | 2 +- session.go | 2 +- session_test.go | 2 +- stream.go | 2 +- stream_frame_sorter.go | 2 +- stream_frame_sorter_test.go | 2 +- stream_framer.go | 2 +- stream_framer_test.go | 2 +- stream_test.go | 3 ++- 58 files changed, 32 insertions(+), 31 deletions(-) rename {wire => internal/wire}/ack_frame.go (100%) rename {wire => internal/wire}/ack_frame_test.go (100%) rename {wire => internal/wire}/ack_range.go (100%) rename {wire => internal/wire}/blocked_frame.go (100%) rename {wire => internal/wire}/blocked_frame_test.go (100%) rename {wire => internal/wire}/connection_close_frame.go (100%) rename {wire => internal/wire}/connection_close_frame_test.go (100%) rename {wire => internal/wire}/frame.go (100%) rename {wire => internal/wire}/goaway_frame.go (100%) rename {wire => internal/wire}/goaway_frame_test.go (100%) rename {wire => internal/wire}/log.go (100%) rename {wire => internal/wire}/log_test.go (100%) rename {wire => internal/wire}/ping_frame.go (100%) rename {wire => internal/wire}/ping_frame_test.go (100%) rename {wire => internal/wire}/public_header.go (100%) rename {wire => internal/wire}/public_header_test.go (100%) rename {wire => internal/wire}/rst_stream_frame.go (100%) rename {wire => internal/wire}/rst_stream_frame_test.go (100%) rename {wire => internal/wire}/stop_waiting_frame.go (100%) rename {wire => internal/wire}/stop_waiting_frame_test.go (100%) rename {wire => internal/wire}/stream_frame.go (100%) rename {wire => internal/wire}/stream_frame_test.go (100%) rename {wire => internal/wire}/version_negotiation.go (100%) rename {wire => internal/wire}/version_negotiation_test.go (100%) rename {wire => internal/wire}/window_update_frame.go (100%) rename {wire => internal/wire}/window_update_frame_test.go (100%) rename {wire => internal/wire}/wire_suite_test.go (100%) diff --git a/ackhandler/interfaces.go b/ackhandler/interfaces.go index 6a4521c50..8c2e79e8c 100644 --- a/ackhandler/interfaces.go +++ b/ackhandler/interfaces.go @@ -3,8 +3,8 @@ package ackhandler import ( "time" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" ) // SentPacketHandler handles ACKs received for outgoing packets diff --git a/ackhandler/packet.go b/ackhandler/packet.go index 2ac7ac05a..901071eb0 100644 --- a/ackhandler/packet.go +++ b/ackhandler/packet.go @@ -3,8 +3,8 @@ package ackhandler import ( "time" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" ) // A Packet is a packet diff --git a/ackhandler/packet_test.go b/ackhandler/packet_test.go index e37e67951..4d3ae5605 100644 --- a/ackhandler/packet_test.go +++ b/ackhandler/packet_test.go @@ -1,7 +1,7 @@ package ackhandler import ( - "github.com/lucas-clemente/quic-go/wire" + "github.com/lucas-clemente/quic-go/internal/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/ackhandler/received_packet_handler.go b/ackhandler/received_packet_handler.go index 203f2b39b..84a476696 100644 --- a/ackhandler/received_packet_handler.go +++ b/ackhandler/received_packet_handler.go @@ -4,8 +4,8 @@ import ( "errors" "time" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" ) var errInvalidPacketNumber = errors.New("ReceivedPacketHandler: Invalid packet number") diff --git a/ackhandler/received_packet_handler_test.go b/ackhandler/received_packet_handler_test.go index 1e5280b2d..2552825a2 100644 --- a/ackhandler/received_packet_handler_test.go +++ b/ackhandler/received_packet_handler_test.go @@ -3,8 +3,8 @@ package ackhandler import ( "time" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/ackhandler/received_packet_history.go b/ackhandler/received_packet_history.go index 9a4e036de..a3488b210 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/internal/utils" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" ) // The receivedPacketHistory stores if a packet number has already been received. diff --git a/ackhandler/received_packet_history_test.go b/ackhandler/received_packet_history_test.go index 58b2a4396..6778a056f 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/internal/utils" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/ackhandler/retransmittable.go b/ackhandler/retransmittable.go index df01361d3..e6ce46f87 100644 --- a/ackhandler/retransmittable.go +++ b/ackhandler/retransmittable.go @@ -1,6 +1,6 @@ package ackhandler -import "github.com/lucas-clemente/quic-go/wire" +import "github.com/lucas-clemente/quic-go/internal/wire" // Returns a new slice with all non-retransmittable frames deleted. func stripNonRetransmittableFrames(fs []wire.Frame) []wire.Frame { diff --git a/ackhandler/retransmittable_test.go b/ackhandler/retransmittable_test.go index df24f5698..aecca065c 100644 --- a/ackhandler/retransmittable_test.go +++ b/ackhandler/retransmittable_test.go @@ -3,7 +3,7 @@ package ackhandler import ( "reflect" - "github.com/lucas-clemente/quic-go/wire" + "github.com/lucas-clemente/quic-go/internal/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/ackhandler/sent_packet_handler.go b/ackhandler/sent_packet_handler.go index 5adef2ad3..f732eab61 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/internal/utils" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" ) const ( diff --git a/ackhandler/sent_packet_handler_test.go b/ackhandler/sent_packet_handler_test.go index 980c5beb7..ec0de7bb1 100644 --- a/ackhandler/sent_packet_handler_test.go +++ b/ackhandler/sent_packet_handler_test.go @@ -4,8 +4,8 @@ import ( "time" "github.com/lucas-clemente/quic-go/congestion" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/ackhandler/stop_waiting_manager.go b/ackhandler/stop_waiting_manager.go index 3d3dcde13..c6efbb1e8 100644 --- a/ackhandler/stop_waiting_manager.go +++ b/ackhandler/stop_waiting_manager.go @@ -1,8 +1,8 @@ package ackhandler import ( + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" ) // This stopWaitingManager is not supposed to satisfy the StopWaitingManager interface, which is a remnant of the legacy AckHandler, and should be remove once we drop support for QUIC 33 diff --git a/ackhandler/stop_waiting_manager_test.go b/ackhandler/stop_waiting_manager_test.go index 6f729b849..809c55dbe 100644 --- a/ackhandler/stop_waiting_manager_test.go +++ b/ackhandler/stop_waiting_manager_test.go @@ -1,7 +1,7 @@ package ackhandler import ( - "github.com/lucas-clemente/quic-go/wire" + "github.com/lucas-clemente/quic-go/internal/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/client.go b/client.go index 435bc2368..b0e4d2557 100644 --- a/client.go +++ b/client.go @@ -11,9 +11,9 @@ import ( "time" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" ) type client struct { diff --git a/client_test.go b/client_test.go index ee8fc5434..9607427fb 100644 --- a/client_test.go +++ b/client_test.go @@ -7,9 +7,9 @@ import ( "net" "time" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/integrationtests/tools/proxy/proxy.go b/integrationtests/tools/proxy/proxy.go index 77483a7a9..2b4edeba9 100644 --- a/integrationtests/tools/proxy/proxy.go +++ b/integrationtests/tools/proxy/proxy.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "time" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" ) // Connection is a UDP connection diff --git a/integrationtests/tools/proxy/proxy_test.go b/integrationtests/tools/proxy/proxy_test.go index 1ea73267a..3b7f840bc 100644 --- a/integrationtests/tools/proxy/proxy_test.go +++ b/integrationtests/tools/proxy/proxy_test.go @@ -9,8 +9,8 @@ import ( "fmt" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/wire/ack_frame.go b/internal/wire/ack_frame.go similarity index 100% rename from wire/ack_frame.go rename to internal/wire/ack_frame.go diff --git a/wire/ack_frame_test.go b/internal/wire/ack_frame_test.go similarity index 100% rename from wire/ack_frame_test.go rename to internal/wire/ack_frame_test.go diff --git a/wire/ack_range.go b/internal/wire/ack_range.go similarity index 100% rename from wire/ack_range.go rename to internal/wire/ack_range.go diff --git a/wire/blocked_frame.go b/internal/wire/blocked_frame.go similarity index 100% rename from wire/blocked_frame.go rename to internal/wire/blocked_frame.go diff --git a/wire/blocked_frame_test.go b/internal/wire/blocked_frame_test.go similarity index 100% rename from wire/blocked_frame_test.go rename to internal/wire/blocked_frame_test.go diff --git a/wire/connection_close_frame.go b/internal/wire/connection_close_frame.go similarity index 100% rename from wire/connection_close_frame.go rename to internal/wire/connection_close_frame.go diff --git a/wire/connection_close_frame_test.go b/internal/wire/connection_close_frame_test.go similarity index 100% rename from wire/connection_close_frame_test.go rename to internal/wire/connection_close_frame_test.go diff --git a/wire/frame.go b/internal/wire/frame.go similarity index 100% rename from wire/frame.go rename to internal/wire/frame.go diff --git a/wire/goaway_frame.go b/internal/wire/goaway_frame.go similarity index 100% rename from wire/goaway_frame.go rename to internal/wire/goaway_frame.go diff --git a/wire/goaway_frame_test.go b/internal/wire/goaway_frame_test.go similarity index 100% rename from wire/goaway_frame_test.go rename to internal/wire/goaway_frame_test.go diff --git a/wire/log.go b/internal/wire/log.go similarity index 100% rename from wire/log.go rename to internal/wire/log.go diff --git a/wire/log_test.go b/internal/wire/log_test.go similarity index 100% rename from wire/log_test.go rename to internal/wire/log_test.go diff --git a/wire/ping_frame.go b/internal/wire/ping_frame.go similarity index 100% rename from wire/ping_frame.go rename to internal/wire/ping_frame.go diff --git a/wire/ping_frame_test.go b/internal/wire/ping_frame_test.go similarity index 100% rename from wire/ping_frame_test.go rename to internal/wire/ping_frame_test.go diff --git a/wire/public_header.go b/internal/wire/public_header.go similarity index 100% rename from wire/public_header.go rename to internal/wire/public_header.go diff --git a/wire/public_header_test.go b/internal/wire/public_header_test.go similarity index 100% rename from wire/public_header_test.go rename to internal/wire/public_header_test.go diff --git a/wire/rst_stream_frame.go b/internal/wire/rst_stream_frame.go similarity index 100% rename from wire/rst_stream_frame.go rename to internal/wire/rst_stream_frame.go diff --git a/wire/rst_stream_frame_test.go b/internal/wire/rst_stream_frame_test.go similarity index 100% rename from wire/rst_stream_frame_test.go rename to internal/wire/rst_stream_frame_test.go diff --git a/wire/stop_waiting_frame.go b/internal/wire/stop_waiting_frame.go similarity index 100% rename from wire/stop_waiting_frame.go rename to internal/wire/stop_waiting_frame.go diff --git a/wire/stop_waiting_frame_test.go b/internal/wire/stop_waiting_frame_test.go similarity index 100% rename from wire/stop_waiting_frame_test.go rename to internal/wire/stop_waiting_frame_test.go diff --git a/wire/stream_frame.go b/internal/wire/stream_frame.go similarity index 100% rename from wire/stream_frame.go rename to internal/wire/stream_frame.go diff --git a/wire/stream_frame_test.go b/internal/wire/stream_frame_test.go similarity index 100% rename from wire/stream_frame_test.go rename to internal/wire/stream_frame_test.go diff --git a/wire/version_negotiation.go b/internal/wire/version_negotiation.go similarity index 100% rename from wire/version_negotiation.go rename to internal/wire/version_negotiation.go diff --git a/wire/version_negotiation_test.go b/internal/wire/version_negotiation_test.go similarity index 100% rename from wire/version_negotiation_test.go rename to internal/wire/version_negotiation_test.go diff --git a/wire/window_update_frame.go b/internal/wire/window_update_frame.go similarity index 100% rename from wire/window_update_frame.go rename to internal/wire/window_update_frame.go diff --git a/wire/window_update_frame_test.go b/internal/wire/window_update_frame_test.go similarity index 100% rename from wire/window_update_frame_test.go rename to internal/wire/window_update_frame_test.go diff --git a/wire/wire_suite_test.go b/internal/wire/wire_suite_test.go similarity index 100% rename from wire/wire_suite_test.go rename to internal/wire/wire_suite_test.go diff --git a/packet_packer.go b/packet_packer.go index addd11a31..876f4f203 100644 --- a/packet_packer.go +++ b/packet_packer.go @@ -7,8 +7,8 @@ import ( "github.com/lucas-clemente/quic-go/ackhandler" "github.com/lucas-clemente/quic-go/handshake" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" ) type packedPacket struct { diff --git a/packet_packer_test.go b/packet_packer_test.go index 374211897..778a485d1 100644 --- a/packet_packer_test.go +++ b/packet_packer_test.go @@ -7,8 +7,8 @@ import ( "github.com/lucas-clemente/quic-go/ackhandler" "github.com/lucas-clemente/quic-go/handshake" "github.com/lucas-clemente/quic-go/internal/mocks" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/packet_unpacker.go b/packet_unpacker.go index 8b5ba55de..437efd9b6 100644 --- a/packet_unpacker.go +++ b/packet_unpacker.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" ) type unpackedPacket struct { diff --git a/packet_unpacker_test.go b/packet_unpacker_test.go index 5426a2a30..4983fa843 100644 --- a/packet_unpacker_test.go +++ b/packet_unpacker_test.go @@ -4,9 +4,9 @@ import ( "bytes" "github.com/lucas-clemente/quic-go/crypto" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/server.go b/server.go index ea16ce591..4c7c6d3c1 100644 --- a/server.go +++ b/server.go @@ -11,9 +11,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/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" ) // packetHandler handles packets diff --git a/server_test.go b/server_test.go index b5c24155e..e0a1dcadb 100644 --- a/server_test.go +++ b/server_test.go @@ -12,9 +12,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/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/session.go b/session.go index 2111ec99f..33a8e3dd6 100644 --- a/session.go +++ b/session.go @@ -14,9 +14,9 @@ import ( "github.com/lucas-clemente/quic-go/flowcontrol" "github.com/lucas-clemente/quic-go/handshake" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" ) type unpacker interface { diff --git a/session_test.go b/session_test.go index 759a6c622..69aebc100 100644 --- a/session_test.go +++ b/session_test.go @@ -20,9 +20,9 @@ import ( "github.com/lucas-clemente/quic-go/internal/mocks" "github.com/lucas-clemente/quic-go/internal/mocks/mocks_fc" "github.com/lucas-clemente/quic-go/internal/testdata" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" - "github.com/lucas-clemente/quic-go/wire" ) type mockConnection struct { diff --git a/stream.go b/stream.go index 7723f977e..4631ed012 100644 --- a/stream.go +++ b/stream.go @@ -10,8 +10,8 @@ import ( "github.com/lucas-clemente/quic-go/flowcontrol" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" ) // 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 3d3a61946..cb2da8184 100644 --- a/stream_frame_sorter.go +++ b/stream_frame_sorter.go @@ -4,8 +4,8 @@ import ( "errors" "github.com/lucas-clemente/quic-go/internal/utils" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" ) type streamFrameSorter struct { diff --git a/stream_frame_sorter_test.go b/stream_frame_sorter_test.go index 7c1ff08f1..0517d4e6e 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/internal/utils" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/stream_framer.go b/stream_framer.go index c93cc4332..3ae4ef978 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/internal/utils" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" ) type streamFramer struct { diff --git a/stream_framer_test.go b/stream_framer_test.go index f9e1056aa..5bf8f3218 100644 --- a/stream_framer_test.go +++ b/stream_framer_test.go @@ -4,8 +4,8 @@ import ( "bytes" "github.com/lucas-clemente/quic-go/internal/mocks/mocks_fc" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/stream_test.go b/stream_test.go index 32c054e67..d941a698b 100644 --- a/stream_test.go +++ b/stream_test.go @@ -10,8 +10,9 @@ import ( "os" "github.com/lucas-clemente/quic-go/internal/mocks/mocks_fc" + "github.com/lucas-clemente/quic-go/internal/wire" "github.com/lucas-clemente/quic-go/protocol" - "github.com/lucas-clemente/quic-go/wire" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes"