graph: Update reqwest to 0.10

Author: leoyvens

graph/Cargo.toml

@@ -8,7 +8,7 @@ bigdecimal = { version = "0.0.14", features = ["serde"] }
 diesel = { version = "1.4.3", features = ["postgres", "serde_json", "numeric", "r2d2"] }
 chrono = "0.4"
 isatty = "0.1"
-reqwest = "0.9"
+reqwest = "0.10"
 
 # graph-patches contains changes such as
 # https://github.com/paritytech/ethabi/pull/140, which upstream does not want
@@ -38,7 +38,7 @@ slog-envlogger = "2.1.0"
 slog-term = "2.4.2"
 petgraph = "0.4.13"
 tiny-keccak = "1.5.0"
-tokio = { version = "0.2.4", features = ["stream", "rt-threaded", "rt-util", "blocking", "time", "sync", "macros", "test-util"] }
+tokio = { version = "0.2.9", features = ["stream", "rt-threaded", "rt-util", "blocking", "time", "sync", "macros", "test-util"] }
 tokio-retry = { git = "https://github.com/graphprotocol/rust-tokio-retry", branch = "update-to-tokio-02" }
 url = "1.7.2"
 prometheus = "0.7.0"

graph/src/log/elastic.rs

@@ -7,8 +7,9 @@ use std::time::Duration;
 
 use chrono::prelude::{SecondsFormat, Utc};
 use futures::Future;
+use futures03::{FutureExt, TryFutureExt};
 use reqwest;
-use reqwest::r#async::Client;
+use reqwest::Client;
 use serde::ser::Serializer as SerdeSerializer;
 use serde::Serialize;
 use serde_json::json;
@@ -272,15 +273,14 @@ impl ElasticDrain {
                         )
                         .body(batch_body)
                         .send()
-                        .and_then(|response| response.error_for_status())
+                        .and_then(|response| async { response.error_for_status() })
                         .map_err(move |e| {
                             // Log if there was a problem sending the logs
                             error!(
                                 logger_for_err,
                                 "Failed to send logs to Elasticsearch: {}", e
                             );
                         })
-                        .compat()
                         .await;
                 }
             },