chore: move the xnet endpoint under rs/http_endpoints and share ownership with the NET team

.github/CODEOWNERS

@@ -123,6 +123,7 @@ go_deps.bzl               @dfinity/idx
 /rs/fuzzers/                                            @dfinity/product-security
 /rs/http_endpoints/                                     @dfinity/networking
 /rs/http_endpoints/fuzz/                                @dfinity/product-security
+/rs/http_endpoints/xnet/                                @dfinity/networking @dfinity/ic-message-routing-owners
 /rs/http_utils/                                         @dfinity/consensus
 /rs/https_outcalls/                                     @dfinity/networking
 /rs/https_outcalls/consensus/                           @dfinity/consensus

Cargo.toml

@@ -120,8 +120,9 @@ members = [
     "rs/execution_environment",
     "rs/execution_environment/benches/lib",
     "rs/execution_environment/tools",
-    "rs/http_endpoints/public",
     "rs/http_endpoints/metrics",
+    "rs/http_endpoints/public",
+    "rs/http_endpoints/xnet",
     "rs/http_utils",
     "rs/ic_os/dev_test_tools/deterministic_ips",
     "rs/ic_os/build_tools/dflate",
@@ -246,6 +247,7 @@ members = [
     "rs/registry/proto_data_provider",
     "rs/registry/provisional_whitelist",
     "rs/registry/regedit",
+    "rs/registry/node_provider_rewards",
     "rs/registry/nns_data_provider",
     "rs/registry/nns_data_provider_wrappers",
     "rs/registry/routing_table",
@@ -394,11 +396,9 @@ members = [
     "rs/validator/ingress_message",
     "rs/validator/ingress_message/test_canister",
     "rs/workload_generator",
-    "rs/xnet/endpoint",
     "rs/xnet/hyper",
     "rs/xnet/payload_builder",
     "rs/xnet/uri",
-    "rs/registry/node_provider_rewards",
 ]
 
 resolver = "2"

rs/xnet/endpoint/BUILD.bazel → rs/http_endpoints/xnet/BUILD.bazel

@@ -45,15 +45,15 @@ DEV_DEPENDENCIES = [
 ]
 
 rust_library(
-    name = "endpoint",
+    name = "xnet",
     srcs = glob(["src/**"]),
-    crate_name = "ic_xnet_endpoint",
+    crate_name = "ic_http_endpoints_xnet",
     version = "0.9.0",
     deps = DEPENDENCIES,
 )
 
 rust_test(
-    name = "endpoint_test",
-    crate = ":endpoint",
+    name = "test",
+    crate = ":xnet",
     deps = DEV_DEPENDENCIES,
 )

rs/xnet/endpoint/Cargo.toml → rs/http_endpoints/xnet/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "ic-xnet-endpoint"
+name = "ic-http-endpoints-xnet"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true

rs/replica/BUILD.bazel

@@ -16,6 +16,7 @@ DEPENDENCIES = [
     "//rs/execution_environment",
     "//rs/http_endpoints/metrics",
     "//rs/http_endpoints/public",
+    "//rs/http_endpoints/xnet",
     "//rs/https_outcalls/client",
     "//rs/interfaces",
     "//rs/interfaces/certified_stream_store",
@@ -35,7 +36,6 @@ DEPENDENCIES = [
     "//rs/state_manager",
     "//rs/sys",
     "//rs/types/types",
-    "//rs/xnet/endpoint",
     "//rs/xnet/payload_builder",
     "@crate_index//:clap_3_2_25",
     "@crate_index//:hex",

rs/replica/Cargo.toml

@@ -21,6 +21,7 @@ ic-cycles-account-manager = { path = "../cycles_account_manager" }
 ic-execution-environment = { path = "../execution_environment" }
 ic-http-endpoints-metrics = { path = "../http_endpoints/metrics" }
 ic-http-endpoints-public = { path = "../http_endpoints/public" }
+ic-http-endpoints-xnet = { path = "../http_endpoints/xnet" }
 ic-https-outcalls-adapter-client = { path = "../https_outcalls/client" }
 ic-interfaces = { path = "../interfaces" }
 ic-interfaces-certified-stream-store = { path = "../interfaces/certified_stream_store" }
@@ -41,7 +42,6 @@ ic-state-manager = { path = "../state_manager" }
 ic-sys = { path = "../sys" }
 ic-tracing = { path = "../monitoring/tracing" }
 ic-types = { path = "../types/types" }
-ic-xnet-endpoint = { path = "../xnet/endpoint" }
 ic-xnet-payload-builder = { path = "../xnet/payload_builder" }
 libc = { workspace = true }
 nix = { workspace = true }

rs/replica/src/setup_ic_stack.rs

@@ -9,6 +9,7 @@ use ic_consensus::certification::VerifierImpl;
 use ic_crypto::CryptoComponent;
 use ic_cycles_account_manager::CyclesAccountManager;
 use ic_execution_environment::ExecutionServices;
+use ic_http_endpoints_xnet::XNetEndpoint;
 use ic_https_outcalls_adapter_client::setup_canister_http_client;
 use ic_interfaces::{
     execution_environment::QueryExecutionService, p2p::artifact_manager::JoinGuard,
@@ -33,7 +34,6 @@ use ic_types::{
     messages::SignedIngress,
     Height, NodeId, PrincipalId, SubnetId,
 };
-use ic_xnet_endpoint::XNetEndpoint;
 use ic_xnet_payload_builder::XNetPayloadBuilderImpl;
 use std::{
     str::FromStr,