refactor(http-types): Remove http_types module and use external ic-http-types crate

Cargo.toml

@@ -46,6 +46,7 @@ hex = "0.4.3"
 http = "1.2.0"
 ic-canister-log = "0.2.0"
 ic-cdk = "0.17.1"
+ic-http-types = "0.1.0"
 ic-ed25519 = "0.1.0"
 ic-metrics-encoder = "1.1"
 ic-stable-structures = "0.6.7"

canister/Cargo.toml

@@ -23,6 +23,7 @@ derive_more = { workspace = true }
 hex = { workspace = true }
 http = { workspace = true }
 ic-cdk = { workspace = true }
+ic-http-types = { workspace = true }
 ic-metrics-encoder = { workspace = true }
 ic-stable-structures = { workspace = true }
 maplit = { workspace = true }

canister/src/lib.rs

@@ -1,7 +1,6 @@
 pub mod candid_rpc;
 pub mod constants;
 pub mod http;
-pub mod http_types;
 pub mod lifecycle;
 pub mod logs;
 pub mod memory;

canister/src/main.rs

@@ -1,10 +1,11 @@
 use candid::candid_method;
 use canlog::{log, Log, Sort};
 use ic_cdk::{api::is_controller, query, update};
+use ic_http_types::{HttpRequest, HttpResponse, HttpResponseBuilder};
 use ic_metrics_encoder::MetricsEncoder;
 use sol_rpc_canister::{
     candid_rpc::send_multi,
-    http_types, lifecycle,
+    lifecycle,
     logs::Priority,
     memory::{mutate_state, read_state, State},
     metrics::encode_metrics,
@@ -241,29 +242,28 @@ async fn json_request_cycles_cost(
 }
 
 #[query(hidden = true)]
-fn http_request(request: http_types::HttpRequest) -> http_types::HttpResponse {
+fn http_request(request: HttpRequest) -> HttpResponse {
     match request.path() {
         "/metrics" => {
             let mut writer = MetricsEncoder::new(vec![], ic_cdk::api::time() as i64 / 1_000_000);
 
             match encode_metrics(&mut writer) {
-                Ok(()) => http_types::HttpResponseBuilder::ok()
+                Ok(()) => HttpResponseBuilder::ok()
                     .header("Content-Type", "text/plain; version=0.0.4")
                     .with_body_and_content_length(writer.into_inner())
                     .build(),
-                Err(err) => http_types::HttpResponseBuilder::server_error(format!(
-                    "Failed to encode metrics: {}",
-                    err
-                ))
-                .build(),
+                Err(err) => {
+                    HttpResponseBuilder::server_error(format!("Failed to encode metrics: {}", err))
+                        .build()
+                }
             }
         }
         "/logs" => {
             let max_skip_timestamp = match request.raw_query_param("time") {
                 Some(arg) => match u64::from_str(arg) {
                     Ok(value) => value,
                     Err(_) => {
-                        return http_types::HttpResponseBuilder::bad_request()
+                        return HttpResponseBuilder::bad_request()
                             .with_body_and_content_length("failed to parse the 'time' parameter")
                             .build()
                     }
@@ -307,12 +307,12 @@ fn http_request(request: http_types::HttpRequest) -> http_types::HttpResponse {
             ));
 
             const MAX_BODY_SIZE: usize = 2_000_000;
-            http_types::HttpResponseBuilder::ok()
+            HttpResponseBuilder::ok()
                 .header("Content-Type", "application/json; charset=utf-8")
                 .with_body_and_content_length(log.serialize_logs(MAX_BODY_SIZE))
                 .build()
         }
-        _ => http_types::HttpResponseBuilder::not_found().build(),
+        _ => HttpResponseBuilder::not_found().build(),
     }
 }
 

integration_tests/Cargo.toml

@@ -14,6 +14,7 @@ canhttp = { workspace = true }
 canlog = { path = "../canlog" }
 const_format = { workspace = true }
 ic-cdk = { workspace = true }
+ic-http-types = { workspace = true }
 ic-test-utilities-load-wasm = { workspace = true }
 num-traits = { workspace = true }
 pocket-ic = { workspace = true }

integration_tests/src/lib.rs

@@ -3,6 +3,7 @@ use candid::{decode_args, encode_args, utils::ArgumentEncoder, CandidType, Encod
 use canhttp::http::json::ConstantSizeId;
 use canlog::{Log, LogEntry};
 use ic_cdk::api::call::RejectionCode;
+use ic_http_types::{HttpRequest, HttpResponse};
 use num_traits::ToPrimitive;
 use pocket_ic::{
     common::rest::{
@@ -14,10 +15,7 @@ use pocket_ic::{
 };
 use regex::Regex;
 use serde::{de::DeserializeOwned, Deserialize};
-use sol_rpc_canister::{
-    http_types::{HttpRequest, HttpResponse},
-    logs::Priority,
-};
+use sol_rpc_canister::logs::Priority;
 use sol_rpc_client::{ClientBuilder, Runtime, SolRpcClient};
 use sol_rpc_types::{InstallArgs, RpcAccess, SupportedRpcProviderId};
 use std::{