Roll the version number to draft-06. This will break interoperability with other MoQT implementations until we update the wire image.

Also, reduce explicit references to the current version in the test code.

PiperOrigin-RevId: 678749414

quiche/quic/moqt/moqt_integration_test.cc

diff --git a/quiche/quic/moqt/moqt_integration_test.cc b/quiche/quic/moqt/moqt_integration_test.cc
index b6cb671..f7578cd 100644
--- a/quiche/quic/moqt/moqt_integration_test.cc
+++ b/quiche/quic/moqt/moqt_integration_test.cc
@@ -38,9 +38,9 @@
  public:
   void CreateDefaultEndpoints() {
     client_ = std::make_unique<MoqtClientEndpoint>(
-        &test_harness_.simulator(), "Client", "Server", MoqtVersion::kDraft05);
+        &test_harness_.simulator(), "Client", "Server", kDefaultMoqtVersion);
     server_ = std::make_unique<MoqtServerEndpoint>(
-        &test_harness_.simulator(), "Server", "Client", MoqtVersion::kDraft05);
+        &test_harness_.simulator(), "Server", "Client", kDefaultMoqtVersion);
     SetupCallbacks();
     test_harness_.set_client(client_.get());
     test_harness_.set_server(server_.get());
@@ -100,7 +100,7 @@
       &test_harness_.simulator(), "Client", "Server",
       MoqtVersion::kUnrecognizedVersionForTests);
   server_ = std::make_unique<MoqtServerEndpoint>(
-      &test_harness_.simulator(), "Server", "Client", MoqtVersion::kDraft05);
+      &test_harness_.simulator(), "Server", "Client", kDefaultMoqtVersion);
   SetupCallbacks();
   test_harness_.set_client(client_.get());
   test_harness_.set_server(server_.get());

quiche/quic/moqt/moqt_messages.h

diff --git a/quiche/quic/moqt/moqt_messages.h b/quiche/quic/moqt/moqt_messages.h
index b3db5b7..c522f01 100644
--- a/quiche/quic/moqt/moqt_messages.h
+++ b/quiche/quic/moqt/moqt_messages.h
@@ -32,11 +32,11 @@
 }
 
 enum class MoqtVersion : uint64_t {
-  kDraft05 = 0xff000005,
+  kDraft06 = 0xff000006,
   kUnrecognizedVersionForTests = 0xfe0000ff,
 };
 
-inline constexpr MoqtVersion kDefaultMoqtVersion = MoqtVersion::kDraft05;
+inline constexpr MoqtVersion kDefaultMoqtVersion = MoqtVersion::kDraft06;
 inline constexpr uint64_t kDefaultInitialMaxSubscribeId = 100;
 
 struct QUICHE_EXPORT MoqtSessionParameters {

quiche/quic/moqt/moqt_session.cc

diff --git a/quiche/quic/moqt/moqt_session.cc b/quiche/quic/moqt/moqt_session.cc
index a411269..2c0c9de 100644
--- a/quiche/quic/moqt/moqt_session.cc
+++ b/quiche/quic/moqt/moqt_session.cc
@@ -604,9 +604,6 @@
   // TODO: handle role and path.
   if (message.max_subscribe_id.has_value()) {
     session_->peer_max_subscribe_id_ = *message.max_subscribe_id;
-  } else if (session_->parameters_.version == MoqtVersion::kDraft05) {
-    // TODO (martinduke): Delete this when we roll the version number.
-    session_->peer_max_subscribe_id_ = UINT64_MAX >> 2;
   }
   std::move(session_->callbacks_.session_established_callback)();
   session_->peer_role_ = *message.role;
@@ -631,9 +628,6 @@
   // TODO: handle role and path.
   if (message.max_subscribe_id.has_value()) {
     session_->peer_max_subscribe_id_ = *message.max_subscribe_id;
-  } else if (session_->parameters_.version == MoqtVersion::kDraft05) {
-    // TODO (martinduke): Delete this when we roll the version number.
-    session_->peer_max_subscribe_id_ = UINT64_MAX >> 2;
   }
   std::move(session_->callbacks_.session_established_callback)();
   session_->peer_role_ = *message.role;

quiche/quic/moqt/moqt_session_test.cc

diff --git a/quiche/quic/moqt/moqt_session_test.cc b/quiche/quic/moqt/moqt_session_test.cc
index 6c29a4b..f1d572f 100644
--- a/quiche/quic/moqt/moqt_session_test.cc
+++ b/quiche/quic/moqt/moqt_session_test.cc
@@ -223,7 +223,7 @@
           &session_, visitor.get());
   // Handle the server setup
   MoqtServerSetup setup = {
-      MoqtVersion::kDraft05,
+      kDefaultMoqtVersion,
       MoqtRole::kPubSub,
   };
   EXPECT_CALL(session_callbacks_.session_established_callback, Call()).Times(1);
@@ -238,7 +238,7 @@
   std::unique_ptr<MoqtControlParserVisitor> stream_input =
       MoqtSessionPeer::CreateControlStream(&server_session, &mock_stream);
   MoqtClientSetup setup = {
-      /*supported_versions=*/{MoqtVersion::kDraft05},
+      /*supported_versions=*/{kDefaultMoqtVersion},
       /*role=*/MoqtRole::kPubSub,
       /*path=*/std::nullopt,
   };
@@ -1207,7 +1207,7 @@
   std::unique_ptr<MoqtControlParserVisitor> stream_input =
       MoqtSessionPeer::CreateControlStream(&server_session, &mock_stream);
   MoqtClientSetup setup = {
-      /*supported_versions*/ {MoqtVersion::kDraft05},
+      /*supported_versions*/ {kDefaultMoqtVersion},
       /*role=*/MoqtRole::kPubSub,
       /*path=*/std::nullopt,
   };

quiche/quic/moqt/tools/moqt_simulator_bin.cc

diff --git a/quiche/quic/moqt/tools/moqt_simulator_bin.cc b/quiche/quic/moqt/tools/moqt_simulator_bin.cc
index 6d08147..e84a37d 100644
--- a/quiche/quic/moqt/tools/moqt_simulator_bin.cc
+++ b/quiche/quic/moqt/tools/moqt_simulator_bin.cc
@@ -67,7 +67,7 @@
 // value just has to be sufficiently larger than the server link bandwidth.
 constexpr QuicBandwidth kClientLinkBandwidth =
     QuicBandwidth::FromBitsPerSecond(10.0e6);
-constexpr MoqtVersion kMoqtVersion = MoqtVersion::kDraft05;
+constexpr MoqtVersion kMoqtVersion = kDefaultMoqtVersion;
 
 // Track name used by the simulator.
 FullTrackName TrackName() { return FullTrackName("test", "track"); }