From 10d0190be137d56aa1b63bbcf1c9b374309025b7 Mon Sep 17 00:00:00 2001
From: Lucas Clemente <lucas@clemente.io>
Date: Tue, 30 Aug 2016 21:42:17 +0200
Subject: [PATCH] remove some v33 mentions

---
 handshake/crypto_setup_test.go |  2 +-
 server.go                      |  3 +--
 session.go                     | 14 ++------------
 session_test.go                | 14 +++-----------
 4 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/handshake/crypto_setup_test.go b/handshake/crypto_setup_test.go
index 508cc9d55..6e982f520 100644
--- a/handshake/crypto_setup_test.go
+++ b/handshake/crypto_setup_test.go
@@ -170,7 +170,7 @@ var _ = Describe("Crypto setup", func() {
 
 	Context("diversification nonce", func() {
 		BeforeEach(func() {
-			cs.version = protocol.Version33
+			cs.version = protocol.Version35
 			cs.secureAEAD = &mockAEAD{}
 			cs.receivedForwardSecurePacket = false
 
diff --git a/server.go b/server.go
index ef184dbd4..d2aeb784d 100644
--- a/server.go
+++ b/server.go
@@ -188,8 +188,7 @@ func composeVersionNegotiation(connectionID protocol.ConnectionID) []byte {
 		PacketNumber: 1,
 		VersionFlag:  true,
 	}
-	// TODO: Update version number
-	err := responsePublicHeader.WritePublicHeader(fullReply, protocol.Version33)
+	err := responsePublicHeader.WritePublicHeader(fullReply, protocol.Version35)
 	if err != nil {
 		utils.Errorf("error composing version negotiation packet: %s", err.Error())
 	}
diff --git a/session.go b/session.go
index d2d6d4ae1..4d5c26e37 100644
--- a/session.go
+++ b/session.go
@@ -453,9 +453,6 @@ func (s *Session) sendPacket() error {
 			}
 			utils.Debugf("\tDequeueing retransmission for packet 0x%x", retransmitPacket.PacketNumber)
 
-			if s.version <= protocol.Version33 {
-				s.stopWaitingManager.RegisterPacketForRetransmission(retransmitPacket)
-			}
 			// resend the frames that were in the packet
 			controlFrames = append(controlFrames, retransmitPacket.GetControlFramesForRetransmission()...)
 			for _, streamFrame := range retransmitPacket.GetStreamFramesForRetransmission() {
@@ -489,12 +486,8 @@ func (s *Session) sendPacket() error {
 		hasRetransmission := s.streamFramer.HasFramesForRetransmission()
 
 		var stopWaitingFrame *frames.StopWaitingFrame
-		if s.version <= protocol.Version33 {
-			stopWaitingFrame = s.stopWaitingManager.GetStopWaitingFrame()
-		} else {
-			if ack != nil || hasRetransmission {
-				stopWaitingFrame = s.sentPacketHandler.GetStopWaitingFrame(hasRetransmission)
-			}
+		if ack != nil || hasRetransmission {
+			stopWaitingFrame = s.sentPacketHandler.GetStopWaitingFrame(hasRetransmission)
 		}
 		packet, err := s.packer.PackPacket(stopWaitingFrame, controlFrames, s.sentPacketHandler.GetLeastUnacked(), maySendOnlyAck)
 		if err != nil {
@@ -523,9 +516,6 @@ func (s *Session) sendPacket() error {
 			return err
 		}
 
-		if s.version <= protocol.Version33 {
-			s.stopWaitingManager.SentStopWaitingWithPacket(packet.number)
-		}
 		s.logPacket(packet)
 		s.delayedAckOriginTime = time.Time{}
 
diff --git a/session_test.go b/session_test.go
index 0cbf595ba..70d5810be 100644
--- a/session_test.go
+++ b/session_test.go
@@ -532,10 +532,7 @@ var _ = Describe("Session", func() {
 	Context("retransmissions", func() {
 		It("sends a StreamFrame from a packet queued for retransmission", func() {
 			// a StopWaitingFrame is added, so make sure the packet number of the new package is higher than the packet number of the retransmitted packet
-			session.packer.lastPacketNumber = 0x1337 + 10
-			if session.version > protocol.Version33 {
-				session.packer.packetNumberGenerator.next = 0x1337 + 9
-			}
+			session.packer.packetNumberGenerator.next = 0x1337 + 9
 
 			f := frames.StreamFrame{
 				StreamID: 0x5,
@@ -552,18 +549,13 @@ var _ = Describe("Session", func() {
 			err := session.sendPacket()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(conn.written).To(HaveLen(1))
-			if session.version > protocol.Version33 { // before version 34, this was handled by the StopWaitingManager
-				Expect(sph.(*mockSentPacketHandler).requestedStopWaiting).To(BeTrue())
-			}
+			Expect(sph.(*mockSentPacketHandler).requestedStopWaiting).To(BeTrue())
 			Expect(conn.written[0]).To(ContainSubstring("foobar1234567"))
 		})
 
 		It("sends a StreamFrame from a packet queued for retransmission", func() {
 			// a StopWaitingFrame is added, so make sure the packet number of the new package is higher than the packet number of the retransmitted packet
-			session.packer.lastPacketNumber = 0x1337 + 10
-			if session.version > protocol.Version33 {
-				session.packer.packetNumberGenerator.next = 0x1337 + 9
-			}
+			session.packer.packetNumberGenerator.next = 0x1337 + 9
 
 			f1 := frames.StreamFrame{
 				StreamID: 0x5,