mirror of
https://github.com/facebookincubator/mvfst.git
synced 2025-08-08 09:42:06 +03:00
Introduce quic::Optional
Summary: The idea here is to make it so we can swap out the type we are using for optionality. In the near term we are going to try swapping towards one that more aggressively tries to save size. For now there is no functional change and this is just a big aliasing diff. Reviewed By: sharmafb Differential Revision: D57633896 fbshipit-source-id: 6eae5953d47395b390016e59cf9d639f3b6c8cfe
This commit is contained in:
Matt Joras
committed by
Facebook GitHub Bot
Facebook GitHub Bot
parent
faba3bdea7
commit
aefc9e369b
@@ -104,7 +104,7 @@ auto buildEmptyPacket(
|
||||
QuicServerConnectionState& conn,
|
||||
PacketNumberSpace pnSpace,
|
||||
bool shortHeader = false) {
|
||||
folly::Optional<PacketHeader> header;
|
||||
Optional<PacketHeader> header;
|
||||
if (shortHeader) {
|
||||
header = ShortHeader(
|
||||
ProtectionType::KeyPhaseZero,
|
||||
@@ -211,13 +211,7 @@ TEST_F(QuicTransportFunctionsTest, PingPacketGoesToOPList) {
|
||||
packet.packet.frames.push_back(PingFrame());
|
||||
EXPECT_EQ(0, conn->outstandings.packets.size());
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
packet.packet,
|
||||
Clock::now(),
|
||||
50,
|
||||
0,
|
||||
false /* isDSRPacket */);
|
||||
*conn, none, packet.packet, Clock::now(), 50, 0, false /* isDSRPacket */);
|
||||
EXPECT_EQ(1, conn->outstandings.packets.size());
|
||||
// But it won't set loss detection alarm
|
||||
EXPECT_FALSE(conn->pendingEvents.setLossDetectionAlarm);
|
||||
@@ -262,7 +256,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnection) {
|
||||
.WillOnce(Return(true));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint{},
|
||||
getEncodedSize(packet),
|
||||
@@ -324,7 +318,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnection) {
|
||||
.WillOnce(Return(false));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet2.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet2),
|
||||
@@ -443,7 +437,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionPacketRetrans) {
|
||||
.WillOnce(Return(true));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet1.packet,
|
||||
TimePoint{},
|
||||
getEncodedSize(packet1),
|
||||
@@ -505,7 +499,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionPacketRetrans) {
|
||||
.WillOnce(Return(false));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet2.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet2),
|
||||
@@ -611,7 +605,7 @@ TEST_F(
|
||||
.WillOnce(Return(true));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet1.packet,
|
||||
TimePoint{},
|
||||
getEncodedSize(packet1),
|
||||
@@ -694,7 +688,7 @@ TEST_F(
|
||||
.WillOnce(Return(false));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet2.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet2),
|
||||
@@ -761,7 +755,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionPacketSorting) {
|
||||
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
handshakePacket.packet,
|
||||
TimePoint{},
|
||||
getEncodedSize(handshakePacket),
|
||||
@@ -769,7 +763,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionPacketSorting) {
|
||||
false /* isDSRPacket */);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
initialPacket.packet,
|
||||
TimePoint{},
|
||||
getEncodedSize(initialPacket),
|
||||
@@ -777,7 +771,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionPacketSorting) {
|
||||
false /* isDSRPacket */);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
appDataPacket.packet,
|
||||
TimePoint{},
|
||||
getEncodedSize(appDataPacket),
|
||||
@@ -829,7 +823,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionFinOnly) {
|
||||
packet.packet.frames.push_back(WriteStreamFrame(stream1->id, 0, 0, true));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -880,7 +874,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionAllBytesExceptFin) {
|
||||
WriteStreamFrame(stream1->id, 0, buf->computeChainDataLength(), false));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -930,7 +924,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionEmptyAckWriteResult) {
|
||||
conn->ackStates.handshakeAckState->largestAckScheduled;
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -968,7 +962,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionPureAckCounter) {
|
||||
packet.packet.frames.push_back(std::move(ackFrame));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -987,7 +981,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionPureAckCounter) {
|
||||
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet2.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1020,7 +1014,7 @@ TEST_F(QuicTransportFunctionsTest, TestPaddingPureAckPacketIsStillPureAck) {
|
||||
packet.packet.frames.push_back(PaddingFrame());
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1057,7 +1051,7 @@ TEST_F(QuicTransportFunctionsTest, TestImplicitAck) {
|
||||
initialStream->writeBuffer.append(data->clone());
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1077,7 +1071,7 @@ TEST_F(QuicTransportFunctionsTest, TestImplicitAck) {
|
||||
initialStream->writeBuffer.append(data->clone());
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1108,7 +1102,7 @@ TEST_F(QuicTransportFunctionsTest, TestImplicitAck) {
|
||||
handshakeStream->writeBuffer.append(data->clone());
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1125,7 +1119,7 @@ TEST_F(QuicTransportFunctionsTest, TestImplicitAck) {
|
||||
handshakeStream->writeBuffer.append(data->clone());
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1183,7 +1177,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionHandshakeCounter) {
|
||||
packet.packet.frames.push_back(WriteCryptoFrame(0, 0));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1205,7 +1199,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionHandshakeCounter) {
|
||||
WriteStreamFrame(stream1->id, 0, 0, true));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
nonHandshake.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1259,7 +1253,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionForOneRttCryptoData) {
|
||||
packet.packet.frames.push_back(WriteCryptoFrame(0, 0));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1277,7 +1271,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionForOneRttCryptoData) {
|
||||
WriteStreamFrame(stream1->id, 0, 0, true));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
nonHandshake.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1341,7 +1335,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionWithPureAck) {
|
||||
EXPECT_CALL(*rawPacer, onPacketSent()).Times(0);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1391,7 +1385,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionWithBytesStats) {
|
||||
conn->lossState.totalAckElicitingPacketsSent = 15;
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
555,
|
||||
@@ -1478,7 +1472,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionWithAppLimitedStats) {
|
||||
// record the packet as having been sent
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
555,
|
||||
@@ -1536,7 +1530,7 @@ TEST_F(
|
||||
// record the packet as having been sent
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
555,
|
||||
@@ -1628,7 +1622,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionStreamWindowUpdate) {
|
||||
packet.packet.frames.push_back(std::move(streamWindowUpdate));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1664,7 +1658,7 @@ TEST_F(QuicTransportFunctionsTest, TestUpdateConnectionConnWindowUpdate) {
|
||||
packet.packet.frames.push_back(std::move(connWindowUpdate));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1694,7 +1688,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsEmptyPacket) {
|
||||
auto packet = buildEmptyPacket(*conn, PacketNumberSpace::AppData);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1714,7 +1708,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsNoStreamsInPacket) {
|
||||
packet.packet.frames.push_back(PingFrame());
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1742,7 +1736,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStream) {
|
||||
packet.packet.frames.push_back(writeStreamFrame);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1756,7 +1750,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStream) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, frameLen),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(frameOffset)),
|
||||
Optional<uint64_t>(frameOffset)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -1784,7 +1778,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamMultipleFrames) {
|
||||
packet.packet.frames.push_back(writeStreamFrame2);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1798,7 +1792,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamMultipleFrames) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, 15),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(0)),
|
||||
Optional<uint64_t>(0)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(0, 14)))));
|
||||
@@ -1824,7 +1818,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
|
||||
packet.packet.frames.push_back(frame1);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1842,7 +1836,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, frame1Len),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(frame1Offset)),
|
||||
Optional<uint64_t>(frame1Offset)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -1861,7 +1855,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
|
||||
packet.packet.frames.push_back(frame1);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1879,7 +1873,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, 0),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(/* empty */)),
|
||||
Optional<uint64_t>(/* empty */)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -1904,7 +1898,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
|
||||
packet.packet.frames.push_back(frame2);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1923,7 +1917,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, frame2Len),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(frame2Offset)),
|
||||
Optional<uint64_t>(frame2Offset)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -1943,7 +1937,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
|
||||
packet.packet.frames.push_back(frame2);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -1962,7 +1956,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamRetransmit) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, 0),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(/* empty */)),
|
||||
Optional<uint64_t>(/* empty */)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -1992,7 +1986,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamFinWithRetransmit) {
|
||||
packet1.packet.frames.push_back(frame1);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet1.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet1),
|
||||
@@ -2006,7 +2000,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamFinWithRetransmit) {
|
||||
packet2.packet.frames.push_back(frame2);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet2.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet2),
|
||||
@@ -2025,7 +2019,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamFinWithRetransmit) {
|
||||
&PacketStreamDetails::newStreamBytesSent, frameLen),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(frameOffset)),
|
||||
Optional<uint64_t>(frameOffset)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -2056,7 +2050,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamFinWithRetransmit) {
|
||||
packet3.packet.frames.push_back(frame2);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet3.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet3),
|
||||
@@ -2075,7 +2069,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsSingleStreamFinWithRetransmit) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, 0),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(/* empty */)),
|
||||
Optional<uint64_t>(/* empty */)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
// contains frame1 and frame2
|
||||
@@ -2108,7 +2102,7 @@ TEST_F(
|
||||
packet1.packet.frames.push_back(frame1);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet1.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet1),
|
||||
@@ -2123,7 +2117,7 @@ TEST_F(
|
||||
packet2.packet.frames.push_back(frame2);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet2.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet2),
|
||||
@@ -2138,7 +2132,7 @@ TEST_F(
|
||||
packet3.packet.frames.push_back(frame3);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet3.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet3),
|
||||
@@ -2157,7 +2151,7 @@ TEST_F(
|
||||
&PacketStreamDetails::newStreamBytesSent, frameLen),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(frameOffset)),
|
||||
Optional<uint64_t>(frameOffset)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -2197,7 +2191,7 @@ TEST_F(
|
||||
packet4.packet.frames.push_back(frame3);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet4.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet4),
|
||||
@@ -2214,7 +2208,7 @@ TEST_F(
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, 0),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(/* empty */)),
|
||||
Optional<uint64_t>(/* empty */)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
// contains frame1 and frame 3
|
||||
@@ -2250,7 +2244,7 @@ TEST_F(
|
||||
packet1.packet.frames.push_back(frame1);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet1.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet1),
|
||||
@@ -2266,7 +2260,7 @@ TEST_F(
|
||||
packet2.packet.frames.push_back(frame2);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet2.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet2),
|
||||
@@ -2282,7 +2276,7 @@ TEST_F(
|
||||
packet3.packet.frames.push_back(frame3);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet3.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet3),
|
||||
@@ -2301,7 +2295,7 @@ TEST_F(
|
||||
&PacketStreamDetails::newStreamBytesSent, frameLen),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(frameOffset)),
|
||||
Optional<uint64_t>(frameOffset)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -2341,7 +2335,7 @@ TEST_F(
|
||||
packet4.packet.frames.push_back(frame3);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet4.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet4),
|
||||
@@ -2358,7 +2352,7 @@ TEST_F(
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, 0),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(/* empty */)),
|
||||
Optional<uint64_t>(/* empty */)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
// contains frame1 and frame 3
|
||||
@@ -2418,7 +2412,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
|
||||
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet1.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet1),
|
||||
@@ -2435,7 +2429,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
|
||||
&PacketStreamDetails::newStreamBytesSent, stream1Len),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(stream1Offset)),
|
||||
Optional<uint64_t>(stream1Offset)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -2449,7 +2443,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
|
||||
&PacketStreamDetails::newStreamBytesSent, stream2Len),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(stream2Offset)),
|
||||
Optional<uint64_t>(stream2Offset)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -2462,7 +2456,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
|
||||
&PacketStreamDetails::newStreamBytesSent, stream3Len),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(stream3Offset)),
|
||||
Optional<uint64_t>(stream3Offset)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -2488,7 +2482,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
|
||||
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet2.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet1),
|
||||
@@ -2505,7 +2499,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, 0),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(/* empty */)),
|
||||
Optional<uint64_t>(/* empty */)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -2517,7 +2511,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, 0),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(/* empty */)),
|
||||
Optional<uint64_t>(/* empty */)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -2529,7 +2523,7 @@ TEST_F(QuicTransportFunctionsTest, StreamDetailsMultipleStreams) {
|
||||
testing::Field(&PacketStreamDetails::newStreamBytesSent, 0),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::maybeFirstNewStreamByteOffset,
|
||||
folly::Optional<uint64_t>(/* empty */)),
|
||||
Optional<uint64_t>(/* empty */)),
|
||||
testing::Field(
|
||||
&PacketStreamDetails::streamIntervals,
|
||||
testing::ElementsAre(Interval<uint64_t>(
|
||||
@@ -3804,7 +3798,7 @@ TEST_F(QuicTransportFunctionsTest, ClearBlockedFromPendingEvents) {
|
||||
conn->streamManager->queueBlocked(stream->id, 1000);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -3850,7 +3844,7 @@ TEST_F(QuicTransportFunctionsTest, TwoConnWindowUpdateWillCrash) {
|
||||
EXPECT_DEATH(
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -3869,7 +3863,7 @@ TEST_F(QuicTransportFunctionsTest, WriteStreamFrameIsNotPureAck) {
|
||||
packet.packet.frames.push_back(std::move(writeStreamFrame));
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -3888,7 +3882,7 @@ TEST_F(QuicTransportFunctionsTest, ClearRstFromPendingEvents) {
|
||||
conn->pendingEvents.resets.emplace(stream->id, rstStreamFrame);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -3930,7 +3924,7 @@ TEST_F(QuicTransportFunctionsTest, TotalBytesSentUpdate) {
|
||||
auto packet = buildEmptyPacket(*conn, PacketNumberSpace::Handshake);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint{},
|
||||
4321,
|
||||
@@ -3947,7 +3941,7 @@ TEST_F(QuicTransportFunctionsTest, TotalPacketsSentUpdate) {
|
||||
auto packet = buildEmptyPacket(*conn, PacketNumberSpace::Handshake);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint{},
|
||||
4321,
|
||||
@@ -4529,7 +4523,7 @@ TEST_F(QuicTransportFunctionsTest, UpdateConnectionWithBufferMeta) {
|
||||
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -4558,7 +4552,7 @@ TEST_F(QuicTransportFunctionsTest, UpdateConnectionWithBufferMeta) {
|
||||
retxPacket.packet.frames.push_back(writeStreamFrame);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
retxPacket.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(retxPacket),
|
||||
@@ -4586,7 +4580,7 @@ TEST_F(QuicTransportFunctionsTest, MissingStreamFrameBytes) {
|
||||
packet.packet.frames.push_back(writeStreamFrame);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -4602,7 +4596,7 @@ TEST_F(QuicTransportFunctionsTest, MissingStreamFrameBytes) {
|
||||
packet.packet.frames.push_back(writeStreamFrame);
|
||||
EXPECT_ANY_THROW(updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -4625,7 +4619,7 @@ TEST_F(QuicTransportFunctionsTest, MissingStreamFrameBytesEof) {
|
||||
packet.packet.frames.push_back(writeStreamFrame);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -4646,7 +4640,7 @@ TEST_F(QuicTransportFunctionsTest, MissingStreamFrameBytesEof) {
|
||||
packet.packet.frames.push_back(writeStreamFrame);
|
||||
EXPECT_ANY_THROW(updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -4669,7 +4663,7 @@ TEST_F(QuicTransportFunctionsTest, MissingStreamFrameBytesSingleByteWrite) {
|
||||
packet.packet.frames.push_back(writeStreamFrame);
|
||||
updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
@@ -4685,7 +4679,7 @@ TEST_F(QuicTransportFunctionsTest, MissingStreamFrameBytesSingleByteWrite) {
|
||||
packet.packet.frames.push_back(writeStreamFrame);
|
||||
EXPECT_ANY_THROW(updateConnection(
|
||||
*conn,
|
||||
folly::none,
|
||||
none,
|
||||
packet.packet,
|
||||
TimePoint(),
|
||||
getEncodedSize(packet),
|
||||
|
||||
Reference in New Issue
Block a user