Merge #1732

1732: Remove explicit dependency on http r=thomaseizinger a=thomaseizinger



Co-authored-by: Thomas Eizinger <thomas@eizinger.io>

Author: bors[bot]

Cargo.lock

@@ -30,7 +30,6 @@ futures = { version = "0.1" }
 futures-core = { version = "=0.3.0-alpha.19", features = ["alloc", "compat", "async-await"], package = "futures-preview" }
 hex = "0.4"
 hex-serde = "0.1.0"
-http = "0.1"
 http-api-problem = "0.13"
 hyper = "0.12"
 lazy_static = "1"

cnd/Cargo.toml

@@ -13,10 +13,10 @@ use crate::{
 };
 use anyhow::Context;
 use blockchain_contracts::bitcoin::witness;
-use http::StatusCode;
 use http_api_problem::HttpApiProblem;
 use serde::{Deserialize, Serialize};
 use std::convert::Infallible;
+use warp::http::StatusCode;
 
 pub trait ToSirenAction {
     fn to_siren_action(&self, id: &SwapId) -> siren::Action;

cnd/src/http_api/action.rs

@@ -5,9 +5,11 @@ use crate::{
         InvalidAction, InvalidActionInvocation,
     },
 };
-use http::StatusCode;
 use http_api_problem::HttpApiProblem;
-use warp::{Rejection, Reply};
+use warp::{
+    http::{self, StatusCode},
+    Rejection, Reply,
+};
 
 #[derive(Debug, thiserror::Error)]
 #[error("Missing GET parameters for a {} action type. Expected: {:?}", action, parameters.iter().map(|parameter| parameter.name).collect::<Vec<&str>>())]

cnd/src/http_api/problem.rs

@@ -28,6 +28,7 @@ use anyhow::Context;
 use futures::Stream;
 use libp2p_comit::frame::Response;
 use std::fmt::Debug;
+use warp::http;
 
 #[allow(clippy::unit_arg, clippy::let_unit_value, clippy::cognitive_complexity)]
 pub async fn handle_action<D: StateStore + Network + Spawn + SwapSeed + Saver + DetermineTypes>(

cnd/src/http_api/routes/rfc003/handlers/action.rs

@@ -25,7 +25,7 @@ use crate::{
 use futures::Future;
 use futures_core::future::{FutureExt, TryFutureExt};
 use hyper::header;
-use warp::{Rejection, Reply};
+use warp::{http, Rejection, Reply};
 
 pub use self::swap_state::{LedgerState, SwapCommunication, SwapCommunicationState, SwapState};
 use crate::{db::Saver, http_api::problem};

cnd/src/http_api/routes/rfc003/mod.rs

@@ -14,10 +14,10 @@ use crate::{
         HashFunction, SwapId, SwapProtocol,
     },
 };
-use http::StatusCode;
 use http_api_problem::HttpApiProblem;
 use libp2p::PeerId;
 use serde::Serialize;
+use warp::http::StatusCode;
 
 #[derive(Debug, Serialize)]
 #[serde(