cleanup some v33 leftovers

This commit is contained in:
Lucas Clemente
2016-08-30 21:48:40 +02:00
parent f8cba7f978
commit 340fb52848
2 changed files with 2 additions and 15 deletions

View File

@@ -162,9 +162,6 @@ var _ = Describe("Chrome tests", func() {
})
It("uploads a large file", func() {
if version < protocol.Version34 {
Skip("skipping on <v34, see #301")
}
dataMan.GenerateData(dataLongLen)
data := dataMan.GetData()
dir, err := ioutil.TempDir("", "quic-upload-src")

View File

@@ -30,19 +30,14 @@ type packetPacker struct {
}
func newPacketPacker(connectionID protocol.ConnectionID, cryptoSetup *handshake.CryptoSetup, connectionParametersHandler *handshake.ConnectionParametersManager, streamFramer *streamFramer, version protocol.VersionNumber) *packetPacker {
p := &packetPacker{
return &packetPacker{
cryptoSetup: cryptoSetup,
connectionID: connectionID,
connectionParametersManager: connectionParametersHandler,
version: version,
streamFramer: streamFramer,
packetNumberGenerator: newPacketNumberGenerator(protocol.SkipPacketAveragePeriodLength),
}
if version >= protocol.Version34 {
p.packetNumberGenerator = newPacketNumberGenerator(protocol.SkipPacketAveragePeriodLength)
}
return p
}
func (p *packetPacker) PackConnectionClose(frame *frames.ConnectionCloseFrame, leastUnacked protocol.PacketNumber) (*packedPacket, error) {
@@ -157,11 +152,6 @@ func (p *packetPacker) composeNextPacket(stopWaitingFrame *frames.StopWaitingFra
maxFrameSize := protocol.MaxFrameAndPublicHeaderSize - publicHeaderLength
// until QUIC 33, packets have a 1 byte private header
if p.version < protocol.Version34 {
maxFrameSize--
}
if stopWaitingFrame != nil {
payloadFrames = append(payloadFrames, stopWaitingFrame)
minLength, err := stopWaitingFrame.MinLength(p.version)