Merge pull request #2599 from ctiller/create-pull-request/patch-2e71284

Automated fix for refs/heads/legacy-again
ctiller · Feb 19, 2025 · a485e5b · a485e5b
2 parents 2e71284 + ce780ff
commit a485e5b
Show file tree

Hide file tree

Showing 22 changed files with 2,692 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
diff --git a/src/core/BUILD b/src/core/BUILD
@@ -8025,14 +8025,14 @@ grpc_cc_library(
         "absl/status:statusor",
     ],
     deps = [
-        "chaotic_good_legacy_server",
         "activity",
         "arena",
         "channel_args",
         "channel_args_endpoint_config",
         "chaotic_good_config",
         "chaotic_good_frame",
         "chaotic_good_frame_header",
+        "chaotic_good_legacy_server",
         "chaotic_good_pending_connection",
         "chaotic_good_server_transport",
         "closure",
@@ -8092,7 +8092,6 @@ grpc_cc_library(
         "absl/status:statusor",
     ],
     deps = [
-        "chaotic_good_legacy_connector",
         "activity",
         "all_ok",
         "arena",
@@ -8103,6 +8102,7 @@ grpc_cc_library(
         "chaotic_good_frame",
         "chaotic_good_frame_cc_proto",
         "chaotic_good_frame_header",
+        "chaotic_good_legacy_connector",
         "closure",
         "context",
         "error",
@@ -8526,10 +8526,10 @@ grpc_cc_library(
         "arena",
         "channel_args",
         "channel_args_endpoint_config",
+        "chaotic_good_frame_cc_proto",
         "chaotic_good_legacy_client_transport",
         "chaotic_good_legacy_config",
         "chaotic_good_legacy_frame",
-        "chaotic_good_frame_cc_proto",
         "chaotic_good_legacy_frame_header",
         "closure",
         "context",

diff --git a/src/core/ext/transport/chaotic_good_legacy/chaotic_good_transport.h b/src/core/ext/transport/chaotic_good_legacy/chaotic_good_transport.h
@@ -246,7 +246,7 @@ class ChaoticGoodTransport : public RefCounted<ChaoticGoodTransport> {
   const Options options_;
 };
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_CHAOTIC_GOOD_TRANSPORT_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/client_transport.cc b/src/core/ext/transport/chaotic_good_legacy/client_transport.cc
@@ -386,5 +386,5 @@ void ChaoticGoodClientTransport::PerformOp(grpc_transport_op* op) {
   ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, absl::OkStatus());
 }
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
diff --git a/src/core/ext/transport/chaotic_good_legacy/client_transport.h b/src/core/ext/transport/chaotic_good_legacy/client_transport.h
@@ -122,7 +122,7 @@ class ChaoticGoodClientTransport final : public ClientTransport {
   MessageChunker message_chunker_;
 };
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_CLIENT_TRANSPORT_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/config.h b/src/core/ext/transport/chaotic_good_legacy/config.h
@@ -223,7 +223,7 @@ class Config {
       supported_features_;
 };
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_CONFIG_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/control_endpoint.cc b/src/core/ext/transport/chaotic_good_legacy/control_endpoint.cc
@@ -69,5 +69,5 @@ ControlEndpoint::ControlEndpoint(
       [](absl::Status) {});
 }
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
diff --git a/src/core/ext/transport/chaotic_good_legacy/control_endpoint.h b/src/core/ext/transport/chaotic_good_legacy/control_endpoint.h
@@ -96,7 +96,7 @@ class ControlEndpoint {
   RefCountedPtr<Buffer> buffer_ = MakeRefCounted<Buffer>();
 };
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_CONTROL_ENDPOINT_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/data_endpoints.cc b/src/core/ext/transport/chaotic_good_legacy/data_endpoints.cc
@@ -297,5 +297,5 @@ DataEndpoints::DataEndpoints(
   }
 }
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
diff --git a/src/core/ext/transport/chaotic_good_legacy/data_endpoints.h b/src/core/ext/transport/chaotic_good_legacy/data_endpoints.h
@@ -219,7 +219,7 @@ class DataEndpoints {
   std::vector<data_endpoints_detail::Endpoint> endpoints_ ABSL_GUARDED_BY(mu_);
 };
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_DATA_ENDPOINTS_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/frame.cc b/src/core/ext/transport/chaotic_good_legacy/frame.cc
@@ -287,5 +287,5 @@ std::string MessageChunkFrame::ToString() const {
                       ", payload=", payload.Length(), "b}");
 }
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
diff --git a/src/core/ext/transport/chaotic_good_legacy/frame.h b/src/core/ext/transport/chaotic_good_legacy/frame.h
@@ -186,7 +186,7 @@ using ServerFrame =
     std::variant<ServerInitialMetadataFrame, MessageFrame, BeginMessageFrame,
                  MessageChunkFrame, ServerTrailingMetadataFrame>;
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_FRAME_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/frame_header.cc b/src/core/ext/transport/chaotic_good_legacy/frame_header.cc
@@ -93,5 +93,5 @@ std::string FrameTypeString(FrameType type) {
   return absl::StrCat("Unknown[", static_cast<int>(type), "]");
 }
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
diff --git a/src/core/ext/transport/chaotic_good_legacy/frame_header.h b/src/core/ext/transport/chaotic_good_legacy/frame_header.h
@@ -86,7 +86,7 @@ inline std::ostream& operator<<(std::ostream& out, const FrameHeader& h) {
   return out << h.ToString();
 }
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_FRAME_HEADER_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/message_chunker.h b/src/core/ext/transport/chaotic_good_legacy/message_chunker.h
@@ -132,7 +132,7 @@ class MessageChunker {
   const uint32_t alignment_;
 };
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_MESSAGE_CHUNKER_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/message_reassembly.h b/src/core/ext/transport/chaotic_good_legacy/message_reassembly.h
@@ -112,7 +112,7 @@ class MessageReassembly {
   std::unique_ptr<ChunkReceiver> chunk_receiver_;
 };
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_MESSAGE_REASSEMBLY_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/pending_connection.h b/src/core/ext/transport/chaotic_good_legacy/pending_connection.h
@@ -68,7 +68,7 @@ inline PendingConnection ImmediateConnection(absl::string_view id,
           -> absl::StatusOr<PromiseEndpoint> { return std::move(endpoint); });
 }
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_PENDING_CONNECTION_H
diff --git a/src/core/ext/transport/chaotic_good_legacy/server_transport.cc b/src/core/ext/transport/chaotic_good_legacy/server_transport.cc
@@ -499,5 +499,5 @@ void ChaoticGoodServerTransport::PerformOp(grpc_transport_op* op) {
   ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, absl::OkStatus());
 }
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
diff --git a/src/core/ext/transport/chaotic_good_legacy/server_transport.h b/src/core/ext/transport/chaotic_good_legacy/server_transport.h
@@ -152,7 +152,7 @@ class ChaoticGoodServerTransport final : public ServerTransport {
   MessageChunker message_chunker_;
 };
 
-}  // namespace chaotic_good
+}  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_LEGACY_SERVER_TRANSPORT_H
diff --git a/test/core/transport/chaotic_good_legacy/BUILD b/test/core/transport/chaotic_good_legacy/BUILD
@@ -292,8 +292,8 @@ grpc_fuzz_test(
         "gtest",
     ],
     deps = [
-        "//src/core:chaotic_good_legacy_config",
         "//src/core:chaotic_good_frame_cc_proto",
+        "//src/core:chaotic_good_legacy_config",
     ],
 )
 

diff --git a/test/core/transport/chaotic_good_legacy/transport_test.h b/test/core/transport/chaotic_good_legacy/transport_test.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_TRANSPORT_TEST_H
-#define GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_TRANSPORT_TEST_H
+#ifndef GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_LEGACY_TRANSPORT_TEST_H
+#define GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_LEGACY_TRANSPORT_TEST_H
 
 #include <google/protobuf/text_format.h>
 
@@ -93,4 +93,4 @@ grpc_event_engine::experimental::Slice EncodeProto(const std::string& fields) {
 }  // namespace chaotic_good_legacy
 }  // namespace grpc_core
 
-#endif  // GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_TRANSPORT_TEST_H
+#endif  // GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_LEGACY_TRANSPORT_TEST_H