diff --git a/Cargo.lock b/Cargo.lock index 700f59be..304d49d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3099,7 +3099,7 @@ dependencies = [ "ic-custom-domains-backend", "ic-custom-domains-base", "ic-http-certification 3.1.0", - "ic-http-gateway", + "ic-http-gateway-protocol", "ic-transport-types 0.47.0", "itertools 0.14.0", "lazy_static", @@ -3169,14 +3169,6 @@ dependencies = [ "urlencoding", ] -[[package]] -name = "ic-http-gateway" -version = "0.0.0-git" -source = "git+https://github.com/dfinity/ic-http-gateway-protocol?tag=v0.5.1#ec1a288ec9f02cd3a398be429a30399844bca2e4" -dependencies = [ - "ic-http-gateway-protocol", -] - [[package]] name = "ic-http-gateway-protocol" version = "0.0.0-git" diff --git a/Cargo.toml b/Cargo.toml index f78fdd87..22689cdb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,7 @@ ic-custom-domains-backend = "0.1" ic-custom-domains-base = "0.1" ic-http-certification = { version = "3.1.0", optional = true } ic-transport-types = "0.47" -ic-http-gateway = { git = "https://github.com/dfinity/ic-http-gateway-protocol", tag = "v0.5.1" } +ic-http-gateway-protocol = { package = "ic-http-gateway-protocol", git = "https://github.com/dfinity/ic-http-gateway-protocol", tag = "v0.5.1" } itertools = "0.14.0" lazy_static = "1.5.0" maxminddb = "0.27.0" diff --git a/benches/http_gateway.rs b/benches/http_gateway.rs index 750e0d75..ecf012a8 100644 --- a/benches/http_gateway.rs +++ b/benches/http_gateway.rs @@ -24,7 +24,7 @@ use ic_bn_lib::{ }; use ic_bn_lib_common::{principal, types::http::ConnInfo}; use ic_http_certification::HttpRequest; -use ic_http_gateway::{CanisterRequest, HttpGatewayClientBuilder}; +use ic_http_gateway_protocol::{CanisterRequest, HttpGatewayClientBuilder}; use uuid::Uuid; use ic_gateway::{ diff --git a/run-tests.sh b/run-tests.sh index fd028002..f176232c 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -6,7 +6,7 @@ readonly POCKETIC_URL="https://github.com/dfinity/pocketic/releases/download/${P readonly POCKETIC_CHECKSUM="80ea3190c497c6486ac9e73303bacb6361f2a42e04c8dc4449caa39b03488764" readonly ASSET_WASM_URL="https://github.com/dfinity/sdk/raw/fec030f53814e7eaa2f869189e8852b5c0e60e5e/src/distributed/assetstorage.wasm.gz" readonly ASSET_WASM_CHECKSUM="865eb25df5a6d857147e078bb33c727797957247f7af2635846d65c5397b36a6" -readonly LARGE_ASSETS_WASM_URL="https://github.com/dfinity/http-gateway/raw/42408f658199d7278d8ff3293504a06e1b0ef61d/examples/http-gateway/canister/http_gateway_canister_custom_assets.wasm.gz" +readonly LARGE_ASSETS_WASM_URL="https://github.com/dfinity/ic-http-gateway-protocol/raw/42408f658199d7278d8ff3293504a06e1b0ef61d/examples/http-gateway/canister/http_gateway_canister_custom_assets.wasm.gz" readonly LARGE_ASSETS_WASM_CHECKSUM="eedcbf986c67fd4ebe3042094604a9a5703e825e56433e2509a6a4d0384ccf95" readonly WORKDIR="$(pwd)" readonly CANISTER_DIR="${WORKDIR}/canister_wasms" diff --git a/src/routing/error_cause.rs b/src/routing/error_cause.rs index e8bbf646..611d61f8 100644 --- a/src/routing/error_cause.rs +++ b/src/routing/error_cause.rs @@ -11,7 +11,7 @@ use ic_bn_lib::{ ic_agent::AgentError, }; use ic_bn_lib_common::types::http::Error as HttpError; -use ic_http_gateway::HttpGatewayError; +use ic_http_gateway_protocol::HttpGatewayError; use ic_transport_types::RejectCode; use serde::{Deserialize, Serialize}; use serde_json::to_string_pretty; diff --git a/src/routing/ic/handler.rs b/src/routing/ic/handler.rs index f7c71334..b0fb8d9d 100644 --- a/src/routing/ic/handler.rs +++ b/src/routing/ic/handler.rs @@ -9,7 +9,7 @@ use bytes::Bytes; use http::{HeaderValue, StatusCode, header::HOST}; use ic_bn_lib::http::{body::buffer_body, headers::X_REQUEST_ID}; use ic_bn_lib_common::types::http::{ConnInfo, Error as HttpError}; -use ic_http_gateway::{CanisterRequest, HttpGatewayClient, HttpGatewayRequestArgs}; +use ic_http_gateway_protocol::{CanisterRequest, HttpGatewayClient, HttpGatewayRequestArgs}; use crate::routing::{ CanisterId, RequestCtx, diff --git a/src/routing/ic/mod.rs b/src/routing/ic/mod.rs index a12ec1a0..4e75a9d1 100644 --- a/src/routing/ic/mod.rs +++ b/src/routing/ic/mod.rs @@ -27,7 +27,7 @@ use ic_bn_lib::{ }, }; use ic_bn_lib_common::traits::http::ClientHttp; -use ic_http_gateway::{ +use ic_http_gateway_protocol::{ HttpGatewayClient, HttpGatewayClientBuilder, HttpGatewayResponse, HttpGatewayResponseMetadata, }; use tracing::warn;