Merge #1757 #1761

1757: Ignore tokio for dependabot r=thomaseizinger a=thomaseizinger



1761: Remove explicit hyper dependency r=thomaseizinger a=thomaseizinger

We depend on hyper implicitely through warp. Removing the explicit dependency avoids problems with dependabot wanting to update it even though the dependency needs to be kept in sync with the transitive one.

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

Author: bors[bot]

.dependabot/config.yml

@@ -27,6 +27,9 @@ update_configs:
       # this needs updating based on the tokio_codec version
       - match:
           dependency_name: "bytes"
+      # until all our code is async/await ready, we cannot update tokio through dependabot
+      - match:
+          dependency_name: "tokio"
   - package_manager: "javascript"
     directory: "/api_tests"
     update_schedule: "daily"

Cargo.lock

@@ -28,7 +28,6 @@ futures-core = { version = "=0.3.0-alpha.19", features = ["alloc", "compat", "as
 hex = "0.4"
 hex-serde = "0.1.0"
 http-api-problem = "0.13"
-hyper = "0.12"
 lazy_static = "1"
 libp2p = { version = "0.13" }
 libp2p-comit = { path = "../libp2p-comit" }

cnd/Cargo.toml

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