remove isHandshake

Summary: This is effectively an unused field encoding duplicated information, but it was widespread. Reviewed By: kvtsoy Differential Revision: D57289922 fbshipit-source-id: ca1499e2576e5ae28e3880b865a29c2b8d9a3d1b
2025-08-01 01:44:22 +03:00 · 2024-06-11 11:02:02 -07:00
parent 4e477f20af
commit 6ce29d58ff
20 changed files with 3 additions and 141 deletions
--- a/quic/api/QuicTransportFunctions.cpp
+++ b/quic/api/QuicTransportFunctions.cpp
@ -623,7 +623,6 @@ void updateConnection(
  auto packetNum = packet.header.getPacketSequenceNum();
  // AckFrame, PaddingFrame and Datagrams are not retx-able.
  bool retransmittable = false;
-  bool isHandshake = false;
  bool isPing = false;
  uint32_t connWindowUpdateSent = 0;
  uint32_t ackFrameCounter = 0;
@ -683,9 +682,6 @@ void updateConnection(
        auto protectionType = packet.header.getProtectionType();
        // NewSessionTicket is sent in crypto frame encrypted with 1-rtt key,
        // however, it is not part of handshake
-        isHandshake =
-            (protectionType == ProtectionType::Initial ||
-             protectionType == ProtectionType::Handshake);
        auto encryptionLevel = protectionTypeToEncryptionLevel(protectionType);
        handleStreamWritten(
            conn,
@ -877,7 +873,6 @@ void updateConnection(
      sentTime,
      encodedSize,
      encodedBodySize,
-      isHandshake,
      // these numbers should all _include_ the current packet
      // conn.lossState.inflightBytes isn't updated until below
      // conn.outstandings.numOutstanding() + 1 since we're emplacing here
--- a/quic/api/test/QuicPacketSchedulerTest.cpp
+++ b/quic/api/test/QuicPacketSchedulerTest.cpp
@ -45,7 +45,6 @@ PacketNum addInitialOutstandingPacket(QuicConnectionStateBase& conn) {
      Clock::now(),
      0,
      0,
-      true,
      0,
      0,
      LossState(),
@ -73,7 +72,6 @@ PacketNum addHandshakeOutstandingPacket(QuicConnectionStateBase& conn) {
      Clock::now(),
      0,
      0,
-      true,
      0,
      0,
      LossState(),
@ -96,7 +94,6 @@ PacketNum addOutstandingPacket(QuicConnectionStateBase& conn) {
      Clock::now(),
      0,
      0,
-      false,
      0,
      0,
      LossState(),
--- a/quic/api/test/QuicTransportFunctionsTest.cpp
+++ b/quic/api/test/QuicTransportFunctionsTest.cpp
@ -3288,36 +3288,6 @@ TEST_F(QuicTransportFunctionsTest, ProbingFallbackToImmediateAck) {
  EXPECT_EQ(1, conn->outstandings.packets.size());
 }

-TEST_F(QuicTransportFunctionsTest, TestCryptoWritingIsHandshakeInOutstanding) {
-  auto conn = createConn();
-  auto cryptoStream = &conn->cryptoState->initialStream;
-  auto buf = buildRandomInputData(200);
-  writeDataToQuicStream(*cryptoStream, buf->clone());
-  EventBase evb;
-  std::shared_ptr<FollyQuicEventBase> qEvb =
-      std::make_shared<FollyQuicEventBase>(&evb);
-  auto socket =
-      std::make_unique<NiceMock<quic::test::MockAsyncUDPSocket>>(qEvb);
-  auto rawSocket = socket.get();
-  auto res = writeCryptoAndAckDataToSocket(
-      *rawSocket,
-      *conn,
-      *conn->clientConnectionId,
-      *conn->serverConnectionId,
-      LongHeader::Types::Initial,
-      *conn->initialWriteCipher,
-      *conn->initialHeaderCipher,
-      getVersion(*conn),
-      conn->transportSettings.writeConnectionDataPacketsLimit);
-
-  EXPECT_EQ(1, res.packetsWritten);
-  EXPECT_EQ(0, res.probesWritten);
-  EXPECT_GE(res.bytesWritten, buf->computeChainDataLength());
-  ASSERT_EQ(1, conn->outstandings.packets.size());
-  EXPECT_TRUE(getFirstOutstandingPacket(*conn, PacketNumberSpace::Initial)
-                  ->metadata.isHandshake);
-}
-
 TEST_F(QuicTransportFunctionsTest, NoCryptoProbeWriteIfNoProbeCredit) {
  auto conn = createConn();
  auto cryptoStream = &conn->cryptoState->initialStream;
@ -3345,8 +3315,6 @@ TEST_F(QuicTransportFunctionsTest, NoCryptoProbeWriteIfNoProbeCredit) {
  EXPECT_EQ(0, res.probesWritten);
  EXPECT_EQ(conn->udpSendPacketLen, res.bytesWritten);
  ASSERT_EQ(1, conn->outstandings.packets.size());
-  EXPECT_TRUE(getFirstOutstandingPacket(*conn, PacketNumberSpace::Initial)
-                  ->metadata.isHandshake);
  ASSERT_EQ(1, cryptoStream->retransmissionBuffer.size());
  ASSERT_TRUE(cryptoStream->writeBuffer.empty());

--- a/quic/codec/test/QuicPacketRebuilderTest.cpp
+++ b/quic/codec/test/QuicPacketRebuilderTest.cpp
@ -33,7 +33,6 @@ OutstandingPacketWrapper makeDummyOutstandingPacket(
      Clock::now(),
      1000,
      0,
-      false,
      totalBytesSentOnConnection,
      0,
      LossState(),
--- a/quic/common/test/TestPacketBuilders.cpp
+++ b/quic/common/test/TestPacketBuilders.cpp
@ -173,12 +173,6 @@ OutstandingPacketBuilder&& OutstandingPacketBuilder::setEncodedBodySize(
  return std::move(*this);
 }

-OutstandingPacketBuilder&& OutstandingPacketBuilder::setIsHandshake(
-    const bool& isHandshakeIn) {
-  maybeIsHandshake = isHandshakeIn;
-  return std::move(*this);
-}
-
 OutstandingPacketBuilder&& OutstandingPacketBuilder::setTotalBytesSent(
    const uint64_t& totalBytesSentIn) {
  maybeTotalBytesSent = totalBytesSentIn;
@ -235,7 +229,6 @@ OutstandingPacketWrapper OutstandingPacketBuilder::build() && {
      *CHECK_NOTNULL(maybeTime.get_pointer()),
      *CHECK_NOTNULL(maybeEncodedSize.get_pointer()),
      *CHECK_NOTNULL(maybeEncodedBodySize.get_pointer()),
-      *CHECK_NOTNULL(maybeIsHandshake.get_pointer()),
      *CHECK_NOTNULL(maybeTotalBytesSent.get_pointer()),
      *CHECK_NOTNULL(maybeInflightBytes.get_pointer()),
      CHECK_NOTNULL(maybeLossState.get_pointer())->get(),
--- a/quic/common/test/TestPacketBuilders.h
+++ b/quic/common/test/TestPacketBuilders.h
@ -54,7 +54,6 @@ struct OutstandingPacketBuilderFields {
  folly::Optional<TimePoint> maybeTime;
  folly::Optional<uint32_t> maybeEncodedSize;
  folly::Optional<uint32_t> maybeEncodedBodySize;
-  folly::Optional<bool> maybeIsHandshake;
  folly::Optional<uint64_t> maybeTotalBytesSent;
  folly::Optional<uint64_t> maybeTotalBodyBytesSent;
  folly::Optional<uint64_t> maybeInflightBytes;
@ -73,7 +72,6 @@ struct OutstandingPacketBuilder : public OutstandingPacketBuilderFields {
  Builder&& setTime(const TimePoint& timeIn);
  Builder&& setEncodedSize(const uint32_t& encodedSizeIn);
  Builder&& setEncodedBodySize(const uint32_t& encodedBodySizeIn);
-  Builder&& setIsHandshake(const bool& isHandshakeIn);
  Builder&& setTotalBytesSent(const uint64_t& totalBytesSentIn);
  Builder&& setTotalBodyBytesSent(const uint64_t& totalBodyBytesSentIn);
  Builder&& setInflightBytes(const uint64_t& inflightBytesIn);
--- a/quic/common/test/TestUtils.cpp
+++ b/quic/common/test/TestUtils.cpp
@ -549,7 +549,6 @@ OutstandingPacketWrapper makeTestingWritePacket(
      sentTime,
      desiredSize,
      0,
-      false,
      totalBytesSent,
      inflightBytes,
      LossState(),
@ -579,7 +578,6 @@ CongestionController::AckEvent makeAck(
      sentTime,
      ackedSize /* encodedSize */,
      ackedSize /* encodedBodySize */,
-      false /* isHandshake */,
      0 /* totalBytesSent */,
      0 /* inflightBytes */,
      LossState() /* lossState */,
--- a/quic/congestion_control/test/Copa2Test.cpp
+++ b/quic/congestion_control/test/Copa2Test.cpp
@ -30,7 +30,6 @@ class Copa2Test : public Test {
        std::move(packet),
        Clock::now(),
        size,
-        false,
        totalSent,
        inflight,
        0,
--- a/quic/congestion_control/test/CopaTest.cpp
+++ b/quic/congestion_control/test/CopaTest.cpp
@ -34,7 +34,6 @@ class CopaTest : public Test {
          Clock::now(),
          10,
          0,
-          false,
          totalSentBytes,
          0,
          LossState(),
@ -59,7 +58,6 @@ class CopaTest : public Test {
        Clock::now(),
        size,
        0,
-        false,
        totalSent,
        inflight,
        LossState(),
--- a/quic/congestion_control/test/NewRenoTest.cpp
+++ b/quic/congestion_control/test/NewRenoTest.cpp
@ -30,7 +30,6 @@ CongestionController::LossEvent createLossEvent(
        Clock::now(),
        10,
        0,
-        false,
        10,
        0,
        LossState(),
@ -64,7 +63,6 @@ CongestionController::AckEvent createAckEvent(
          packetSentTime,
          ackedSize,
          0,
-          false,
          ackedSize,
          0,
          LossState(),
@ -86,7 +84,6 @@ OutstandingPacketWrapper createPacket(
      sendTime,
      size,
      0,
-      false,
      size,
      inflight,
      LossState(),
--- a/quic/loss/QuicLossFunctions.cpp
+++ b/quic/loss/QuicLossFunctions.cpp
@ -373,8 +373,7 @@ bool processOutstandingsForLoss(
      CHECK(conn.outstandings.packetCount[currentPacketNumberSpace]);
      --conn.outstandings.packetCount[currentPacketNumberSpace];
    }
-    VLOG(10) << __func__ << " lost packetNum=" << currentPacketNum
-             << " handshake=" << pkt.metadata.isHandshake << " " << conn;
+    VLOG(10) << __func__ << " lost packetNum=" << currentPacketNum;
    // Rather than erasing here, instead mark the packet as lost so we can
    // determine if this was spurious later.
    conn.lossState.totalPacketsMarkedLost++;
--- a/quic/loss/QuicLossFunctions.h
+++ b/quic/loss/QuicLossFunctions.h
@ -287,7 +287,6 @@ void markZeroRttPacketsLost(
        iter->packet.header.getProtectionType() == ProtectionType::ZeroRtt;
    if (isZeroRttPacket) {
      auto& pkt = *iter;
-      DCHECK(!pkt.metadata.isHandshake);
      bool processed = pkt.associatedEvent &&
          !conn.outstandings.packetEvents.count(*pkt.associatedEvent);
      lossVisitor(conn, pkt.packet, processed);
--- a/quic/loss/test/QuicLossFunctionsTest.cpp
+++ b/quic/loss/test/QuicLossFunctionsTest.cpp
@ -194,7 +194,6 @@ PacketNum QuicLossFunctionsTest::sendPacket(
    folly::Optional<uint16_t> forcedSize,
    bool isDsr) {
  folly::Optional<PacketHeader> header;
-  bool isHandshake = false;
  switch (packetType) {
    case PacketType::Initial:
      header = LongHeader(
@ -203,7 +202,6 @@ PacketNum QuicLossFunctionsTest::sendPacket(
          *conn.serverConnectionId,
          conn.ackStates.initialAckState->nextPacketNum,
          *conn.version);
-      isHandshake = true;
      break;
    case PacketType::Handshake:
      header = LongHeader(
@ -212,7 +210,6 @@ PacketNum QuicLossFunctionsTest::sendPacket(
          *conn.serverConnectionId,
          conn.ackStates.handshakeAckState->nextPacketNum,
          *conn.version);
-      isHandshake = true;
      break;
    case PacketType::ZeroRtt:
      header = LongHeader(
@ -263,7 +260,6 @@ PacketNum QuicLossFunctionsTest::sendPacket(
      time,
      encodedSize,
      encodedBodySize,
-      isHandshake,
      encodedSize,
      0,
      LossState(),
@ -735,9 +731,7 @@ TEST_F(QuicLossFunctionsTest, TestReorderingThreshold) {
       iter <
       getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake) + 5;
       iter++) {
-    if (iter->metadata.isHandshake) {
-      conn->outstandings.packetCount[PacketNumberSpace::Handshake]--;
-    }
+    conn->outstandings.packetCount[PacketNumberSpace::Handshake]--;
  }
  auto firstHandshakeOpIter =
      getFirstOutstandingPacket(*conn, PacketNumberSpace::Handshake);
@ -794,7 +788,6 @@ TEST_F(QuicLossFunctionsTest, TestHandleAckForLoss) {
      now,
      0,
      0,
-      false,
      0,
      0,
      LossState(),
@ -1850,7 +1843,6 @@ TEST_F(QuicLossFunctionsTest, PersistentCongestionAckOutsideWindow) {
      currentTime + 12s /* sentTime */,
      0 /* encodedSize */,
      0 /* encodedBodySize */,
-      false /* isHandshake */,
      0 /* totalBytesSent */,
      0 /* inflightBytes */,
      LossState() /* lossState */,
@ -1885,7 +1877,6 @@ TEST_F(QuicLossFunctionsTest, PersistentCongestionAckInsideWindow) {
      currentTime + 4s /* sentTime */,
      0 /* encodedSize */,
      0 /* encodedBodySize */,
-      false /* isHandshake */,
      0 /* totalBytesSent */,
      0 /* inflightBytes */,
      LossState() /* lossState */,
@ -1919,7 +1910,6 @@ TEST_F(QuicLossFunctionsTest, PersistentCongestionNoPTO) {
      currentTime + 12s /* sentTime */,
      0 /* encodedSize */,
      0 /* encodedBodySize */,
-      false /* isHandshake */,
      0 /* totalBytesSent */,
      0 /* inflightBytes */,
      LossState() /* lossState */,
--- a/quic/observer/test/SocketObserverInterfaceTest.cpp
+++ b/quic/observer/test/SocketObserverInterfaceTest.cpp
@ -54,7 +54,6 @@ class SocketObserverInterfaceTest : public ::testing::Test {
        .setTime(TimePoint())
        .setEncodedSize(0)
        .setEncodedBodySize(0)
-        .setIsHandshake(false)
        .setTotalBytesSent(0)
        .setTotalBodyBytesSent(0)
        .setInflightBytes(0)
--- a/quic/state/AckHandlers.cpp
+++ b/quic/state/AckHandlers.cpp
@ -225,9 +225,7 @@ AckEvent processAckFrame(
      rPacketIt->metadata.scheduledForDestruction = true;
      conn.outstandings.scheduledForDestructionCount++;
      VLOG(10) << __func__ << " acked packetNum=" << currentPacketNum
-               << " space=" << currentPacketNumberSpace << " handshake="
-               << (int)((rPacketIt->metadata.isHandshake) ? 1 : 0) << " "
-               << conn;
+               << " space=" << currentPacketNumberSpace << conn;
      // If we hit a packet which has been lost we need to count the spurious
      // loss and ignore all other processing.
      if (rPacketIt->declaredLost) {
--- a/quic/state/OutstandingPacket.h
+++ b/quic/state/OutstandingPacket.h
@ -22,8 +22,6 @@ struct OutstandingPacketMetadata {
  uint32_t encodedSize;
  // Size of only the body within the packet sent on the wire.
  uint32_t encodedBodySize;
-  // Whether this packet has any data from stream 0
-  bool isHandshake;
  // Total sent bytes on this connection including this packet itself when this
  // packet is sent.
  uint64_t totalBytesSent;
@ -114,7 +112,6 @@ struct OutstandingPacketMetadata {
      TimePoint timeIn,
      uint32_t encodedSizeIn,
      uint32_t encodedBodySizeIn,
-      bool isHandshakeIn,
      uint64_t totalBytesSentIn,
      uint64_t inflightBytesIn,
      const LossState& lossStateIn,
@ -124,7 +121,6 @@ struct OutstandingPacketMetadata {
      : time(timeIn),
        encodedSize(encodedSizeIn),
        encodedBodySize(encodedBodySizeIn),
-        isHandshake(isHandshakeIn),
        totalBytesSent(totalBytesSentIn),
        inflightBytes(inflightBytesIn),
        totalAckElicitingPacketsSent(lossStateIn.totalAckElicitingPacketsSent),
@ -198,7 +194,6 @@ struct OutstandingPacket {
      TimePoint timeIn,
      uint32_t encodedSizeIn,
      uint32_t encodedBodySizeIn,
-      bool isHandshakeIn,
      uint64_t totalBytesSentIn,
      uint64_t inflightBytesIn,
      const LossState& lossStateIn,
@ -210,7 +205,6 @@ struct OutstandingPacket {
            timeIn,
            encodedSizeIn,
            encodedBodySizeIn,
-            isHandshakeIn,
            totalBytesSentIn,
            inflightBytesIn,
            lossStateIn,
@ -232,7 +226,6 @@ struct OutstandingPacketWrapper : OutstandingPacket {
      TimePoint timeIn,
      uint32_t encodedSizeIn,
      uint32_t encodedBodySizeIn,
-      bool isHandshakeIn,
      uint64_t totalBytesSentIn,
      uint64_t inflightBytesIn,
      const LossState& lossStateIn,
@ -246,7 +239,6 @@ struct OutstandingPacketWrapper : OutstandingPacket {
            timeIn,
            encodedSizeIn,
            encodedBodySizeIn,
-            isHandshakeIn,
            totalBytesSentIn,
            inflightBytesIn,
            lossStateIn,
--- a/quic/state/test/AckHandlersTest.cpp
+++ b/quic/state/test/AckHandlersTest.cpp
@ -71,7 +71,6 @@ auto emplacePackets(
        sentTime,
        1,
        0,
-        false /* handshake */,
        packetNum,
        packetNum + 1,
        quic::LossState(),
@ -190,7 +189,6 @@ TEST_P(AckHandlersTest, TestAckMultipleSequentialBlocks) {
        sentTime,
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -267,7 +265,6 @@ TEST_P(AckHandlersTest, TestAckWithECN) {
      packetSendTime,
      0,
      0,
-      false,
      0,
      0,
      LossState(),
@ -339,7 +336,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossFullRemoval) {
      startTime,
      1,
      0,
-      false /* handshake */,
      0,
      1,
      quic::LossState(),
@ -419,7 +415,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossSplitMiddleRemoval) {
      startTime,
      1,
      0,
-      false /* handshake */,
      0,
      1,
      quic::LossState(),
@ -505,7 +500,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossTrimFrontRemoval) {
      startTime,
      1,
      0,
-      false /* handshake */,
      0,
      1,
      quic::LossState(),
@ -588,7 +582,6 @@ TEST_P(AckHandlersTest, TestSpuriousLossSplitFrontRemoval) {
      startTime,
      1,
      0,
-      false /* handshake */,
      0,
      1,
      quic::LossState(),
@ -674,7 +667,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionAcks) {
        sentTime,
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -754,7 +746,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionSpuriousLoss) {
        startTime + std::chrono::milliseconds((packetNum - 1) * 100),
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -820,7 +811,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionSpuriousLoss) {
        startTime + std::chrono::milliseconds((packetNum - 1) * 100),
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -898,7 +888,6 @@ TEST_P(AckHandlersTest, TestPacketDestructionBigDeque) {
        sentTime,
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -1005,7 +994,6 @@ TEST_P(AckHandlersTest, TestAckMultipleSequentialBlocksLoss) {
        sentTime,
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -1163,7 +1151,6 @@ TEST_P(AckHandlersTest, TestAckBlocksWithGaps) {
        Clock::now(),
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -1281,7 +1268,6 @@ TEST_P(AckHandlersTest, TestNonSequentialPacketNumbers) {
        Clock::now(),
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -1303,7 +1289,6 @@ TEST_P(AckHandlersTest, TestNonSequentialPacketNumbers) {
        Clock::now(),
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -1400,7 +1385,6 @@ TEST_P(AckHandlersTest, AckVisitorForAckTest) {
      Clock::now(),
      0,
      0,
-      false,
      0,
      0,
      LossState(),
@ -1422,7 +1406,6 @@ TEST_P(AckHandlersTest, AckVisitorForAckTest) {
      Clock::now(),
      0,
      0,
-      false,
      0,
      0,
      LossState(),
@ -1495,7 +1478,6 @@ TEST_P(AckHandlersTest, NoNewAckedPacket) {
      Clock::now(),
      0,
      0,
-      false,
      0,
      0,
      LossState(),
@ -1555,7 +1537,6 @@ TEST_P(AckHandlersTest, AckPacketNumDoesNotExist) {
      Clock::now(),
      0,
      0,
-      false,
      0,
      0,
      LossState(),
@ -1572,7 +1553,6 @@ TEST_P(AckHandlersTest, AckPacketNumDoesNotExist) {
      Clock::now(),
      0,
      0,
-      false,
      0,
      0,
      LossState(),
@ -1616,7 +1596,6 @@ TEST_P(AckHandlersTest, TestHandshakeCounterUpdate) {
        Clock::now(),
        0,
        0,
-        packetNum % 2 && GetParam().pnSpace != PacketNumberSpace::AppData,
        packetNum / 2,
        0,
        LossState(),
@ -1828,7 +1807,6 @@ TEST_P(AckHandlersTest, NoSkipAckVisitor) {
      Clock::now(),
      1,
      0,
-      false,
      1,
      0,
      LossState(),
@ -1892,7 +1870,6 @@ TEST_P(AckHandlersTest, SkipAckVisitor) {
      Clock::now(),
      1,
      0,
-      false,
      1,
      0,
      LossState(),
@ -1954,7 +1931,6 @@ TEST_P(AckHandlersTest, MultiplePacketProcessors) {
        Clock::now(),
        1,
        0,
-        false,
        1 * (packetNum + 1),
        0,
        LossState(),
@ -2015,7 +1991,6 @@ TEST_P(AckHandlersTest, NoDoubleProcess) {
      Clock::now(),
      1,
      0,
-      false,
      1,
      0,
      LossState(),
@ -2028,7 +2003,6 @@ TEST_P(AckHandlersTest, NoDoubleProcess) {
      Clock::now(),
      1,
      0,
-      false,
      1,
      0,
      LossState(),
@ -2094,7 +2068,6 @@ TEST_P(AckHandlersTest, ClonedPacketsCounter) {
      Clock::now(),
      1,
      0,
-      false,
      1,
      0,
      LossState(),
@ -2111,7 +2084,6 @@ TEST_P(AckHandlersTest, ClonedPacketsCounter) {
      Clock::now(),
      1,
      0,
-      false,
      1,
      0,
      LossState(),
@ -2163,7 +2135,6 @@ TEST_P(AckHandlersTest, UpdateMaxAckDelay) {
      sentTime,
      1,
      0,
-      false,
      1,
      0,
      LossState(),
@ -2239,7 +2210,6 @@ TEST_P(AckHandlersTest, AckNotOutstandingButLoss) {
      Clock::now() - delayUntilLost - 20ms,
      1,
      0,
-      false,
      1,
      0,
      LossState(),
@ -2290,7 +2260,6 @@ TEST_P(AckHandlersTest, UpdatePendingAckStates) {
      sentTime,
      111,
      100,
-      false,
      conn.lossState.totalBytesSent + 111,
      0,
      LossState(),
@ -2359,7 +2328,6 @@ TEST_P(AckHandlersTest, AckEventCreation) {
        getSentTime(packetNum),
        1 /* encodedSizeIn */,
        0 /* encodedBodySizeIn */,
-        false /* isHandshakeIn */,
        1 * (packetNum + 1) /* totalBytesSentIn */,
        0 /* inflightBytesIn */,
        LossState(),
@ -2487,7 +2455,6 @@ TEST_P(AckHandlersTest, AckEventCreationSingleWrite) {
        getSentTime(packetNum),
        1 /* encodedSizeIn */,
        0 /* encodedBodySizeIn */,
-        false /* isHandshakeIn */,
        1 * (packetNum + 1) /* totalBytesSentIn */,
        0 /* inflightBytesIn */,
        LossState(),
@ -2616,7 +2583,6 @@ TEST_P(AckHandlersTest, AckEventCreationNoCongestionController) {
        getSentTime(packetNum),
        1 /* encodedSizeIn */,
        0 /* encodedBodySizeIn */,
-        false /* isHandshakeIn */,
        1 * (packetNum + 1) /* totalBytesSentIn */,
        0 /* inflightBytesIn */,
        LossState(),
@ -3350,7 +3316,6 @@ TEST_P(AckHandlersTest, AckEventCreationInvalidAckDelay) {
        getSentTime(packetNum),
        1 /* encodedSizeIn */,
        0 /* encodedBodySizeIn */,
-        false /* isHandshakeIn */,
        1 * (packetNum + 1) /* totalBytesSentIn */,
        0 /* inflightBytesIn */,
        LossState(),
@ -3454,7 +3419,6 @@ TEST_P(AckHandlersTest, AckEventCreationRttMinusAckDelayIsZero) {
        getSentTime(packetNum),
        1 /* encodedSizeIn */,
        0 /* encodedBodySizeIn */,
-        false /* isHandshakeIn */,
        1 * (packetNum + 1) /* totalBytesSentIn */,
        0 /* inflightBytesIn */,
        LossState(),
@ -3565,7 +3529,6 @@ TEST_P(AckHandlersTest, AckEventCreationReorderingLargestPacketAcked) {
        getSentTime(packetNum),
        1 /* encodedSizeIn */,
        0 /* encodedBodySizeIn */,
-        false /* isHandshakeIn */,
        1 * (packetNum + 1) /* totalBytesSentIn */,
        0 /* inflightBytesIn */,
        LossState(),
@ -3797,7 +3760,6 @@ TEST_P(AckHandlersTest, AckEventCreationNoMatchingPacketDueToLoss) {
        getSentTime(packetNum),
        1 /* encodedSizeIn */,
        0 /* encodedBodySizeIn */,
-        false /* isHandshakeIn */,
        1 * (packetNum + 1) /* totalBytesSentIn */,
        0 /* inflightBytesIn */,
        LossState(),
@ -3938,7 +3900,6 @@ TEST_P(AckHandlersTest, ImplictAckEventCreation) {
        getSentTime(packetNum),
        1 /* encodedSizeIn */,
        0 /* encodedBodySizeIn */,
-        false /* isHandshakeIn */,
        1 * (packetNum + 1) /* totalBytesSentIn */,
        0 /* inflightBytesIn */,
        LossState(),
@ -4040,7 +4001,6 @@ TEST_P(AckHandlersTest, ObserverRttSample) {
        sentTime,
        1,
        0,
-        false /* handshake */,
        packetNum,
        packetNum + 1,
        LossState(),
@ -4324,7 +4284,6 @@ TEST_P(AckHandlersTest, SubMicrosecondRTT) {
      packetSendTime,
      0,
      0,
-      false,
      0,
      0,
      LossState(),
--- a/quic/state/test/OutstandingPacketTest.cpp
+++ b/quic/state/test/OutstandingPacketTest.cpp
@ -48,7 +48,6 @@ TEST(OutstandingPacketTest, BasicPacketDestructionCallback) {
        sentTime,
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -98,7 +97,6 @@ TEST(OutstandingPacketTest, BasicPacketDestructionDequeDestroy) {
          sentTime,
          1,
          0,
-          false,
          packetNum,
          0,
          LossState(),
@ -138,7 +136,6 @@ TEST(OutstandingPacketTest, BasicPacketDestructionNoCallback) {
          sentTime,
          1,
          0,
-          false,
          packetNum,
          0,
          LossState(),
@ -174,7 +171,6 @@ TEST(OutstandingPacketTest, PacketMoveConstuctorCallback) {
        sentTime,
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -217,7 +213,6 @@ TEST(OutstandingPacketTest, PacketMoveAssignCallback) {
        sentTime,
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -260,7 +255,6 @@ TEST(OutstandingPacketTest, PacketMoveAssignExistingPacketCallback) {
        sentTime,
        1,
        0,
-        false,
        packetNum,
        0,
        LossState(),
@ -280,7 +274,6 @@ TEST(OutstandingPacketTest, PacketMoveAssignExistingPacketCallback) {
        sentTime,
        1,
        0,
-        false,
        packetNum + 1,
        0,
        LossState(),
@ -333,7 +326,6 @@ TEST(OutstandingPacketTest, DequeMoveAssignPacketDestructionCallback) {
          sentTime,
          1,
          0,
-          false,
          packetNum,
          0,
          LossState(),
--- a/quic/state/test/QuicStateFunctionsTest.cpp
+++ b/quic/state/test/QuicStateFunctionsTest.cpp
@ -1142,7 +1142,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
      Clock::now(),
      135,
      0,
-      false,
      0,
      0,
      LossState(),
@ -1153,7 +1152,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
      Clock::now(),
      1217,
      0,
-      false,
      0,
      0,
      LossState(),
@ -1164,7 +1162,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
      Clock::now(),
      5556,
      5000,
-      false,
      0,
      0,
      LossState(),
@ -1175,7 +1172,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
      Clock::now(),
      56,
      0,
-      false,
      0,
      0,
      LossState(),
@ -1186,7 +1182,6 @@ TEST_F(QuicStateFunctionsTest, GetOutstandingPackets) {
      Clock::now(),
      6665,
      6000,
-      false,
      0,
      0,
      LossState(),
--- a/quic/state/test/StateDataTest.cpp
+++ b/quic/state/test/StateDataTest.cpp
@ -150,7 +150,6 @@ TEST_F(StateDataTest, SingleLostPacketEvent) {
      Clock::now(),
      1234,
      0,
-      false,
      1234,
      0,
      LossState(),
@ -174,7 +173,6 @@ TEST_F(StateDataTest, MultipleLostPacketsEvent) {
      Clock::now(),
      1234,
      0,
-      false,
      1234,
      0,
      LossState(),
@ -192,7 +190,6 @@ TEST_F(StateDataTest, MultipleLostPacketsEvent) {
      Clock::now(),
      1357,
      0,
-      false,
      1357,
      0,
      LossState(),