Skip to content
This repository has been archived by the owner on Sep 13, 2023. It is now read-only.

Commit

Permalink
bump ic-agent, clap and release (#48)
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel-Bloom-dfinity authored Sep 30, 2022
1 parent 1fb04a4 commit 4f73294
Show file tree
Hide file tree
Showing 12 changed files with 171 additions and 477 deletions.
243 changes: 118 additions & 125 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "icx-proxy"
version = "0.10.0"
version = "0.10.1"
authors = ["DFINITY Stiftung <[email protected]>"]
edition = "2018"
description = "CLI tool to create an HTTP proxy to the Internet Computer."
Expand All @@ -21,7 +21,7 @@ anyhow = "1"
axum = "0.5"
base64 = "0.13"
candid = { version = "0.7", features = ["mute_warnings"] }
clap = { version = "3", features = ["cargo", "derive"] }
clap = { version = "4", features = ["cargo", "derive"] }
flate2 = "1"
form_urlencoded = "1"
futures = "0.3"
Expand All @@ -31,8 +31,8 @@ http-body = "0.4"
hyper = { version = "0.14.11", features = ["client", "http2", "http1"] }
hyper-rustls = { version = "0.23", features = [ "webpki-roots", "http2" ] }
itertools = "0.10"
ic-agent = { version = "0.20", default-features = false }
ic-utils = { version = "0.20", features = ["raw"] }
ic-agent = { version = "0.20.1", default-features = false, features = ["hyper"] }
ic-utils = { version = "0.20.1", features = ["raw"] }
lazy-regex = "2"
opentelemetry = "0.17"
opentelemetry-prometheus = "0.10"
Expand Down
12 changes: 8 additions & 4 deletions src/canister_id.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
use crate::http_transport::hyper::{header::HOST, http::request::Parts, Uri};
use anyhow::Context;
use clap::Args;
use ic_agent::export::Principal;
use ic_agent::{
agent::http_transport::hyper::{header::HOST, http::request::Parts, Uri},
export::Principal,
};
use tracing::error;

use crate::config::dns_canister_config::DnsCanisterConfig;
Expand Down Expand Up @@ -123,11 +125,13 @@ pub fn setup(opts: Opts) -> Result<DefaultResolver, anyhow::Error> {

#[cfg(test)]
mod tests {
use ic_agent::export::Principal;
use ic_agent::{
agent::http_transport::hyper::{header::HOST, http::request::Parts, Request},
export::Principal,
};

use super::{DefaultResolver, Resolver};
use crate::config::dns_canister_config::DnsCanisterConfig;
use crate::http_transport::hyper::{header::HOST, http::request::Parts, Request};

#[test]
fn simple_resolve() {
Expand Down
4 changes: 3 additions & 1 deletion src/http_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use hyper_rustls::HttpsConnectorBuilder;
use itertools::Either;
use tracing::error;

use crate::http_transport::{
use ic_agent::agent::http_transport::{
self,
hyper::{
self,
Expand All @@ -33,6 +33,8 @@ use crate::http_transport::{

/// DNS resolve overrides
/// `ic0.app=[::1]:9090`

#[derive(Clone)]
struct OptResolve {
domain: String,
addr: SocketAddr,
Expand Down
312 changes: 0 additions & 312 deletions src/http_transport.rs

This file was deleted.

Loading

0 comments on commit 4f73294

Please sign in to comment.