graph, graphql: Removed dead code, and fix dependancy

graphprotocol · Aug 11, 2021 · ce8d71a · ce8d71a
1 parent 75e9df7
commit ce8d71a
Show file tree

Hide file tree

Showing 4 changed files with 150 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/graph/Cargo.toml b/graph/Cargo.toml
@@ -14,7 +14,7 @@ diesel_derives = "1.4"
 chrono = "0.4.19"
 Inflector = "0.11.3"
 isatty = "0.1.9"
-reqwest = { version = "0.11.2", features = ["json", "stream", "multipart"] }
+reqwest = { version = "0.11.2", features = ["json", "stream", "multipart", "trust-dns-resolver"] }
 
 # master contains changes such as
 # https://github.com/paritytech/ethabi/pull/140, which upstream does not want
@@ -48,7 +48,7 @@ slog-term = "2.7.0"
 petgraph = "0.6.0"
 tiny-keccak = "1.5.0"
 tokio = { version = "1.9.0", features = ["time", "sync", "macros", "test-util", "rt-multi-thread"] }
-tokio-stream = { version = "0.1.6", features = ["sync"] }
+tokio-stream = { version = "0.1.7", features = ["sync"] }
 tokio-retry = "0.3.0"
 url = "2.2.1"
 prometheus = "0.12.0"

diff --git a/graph/src/blockchain/block_stream.rs b/graph/src/blockchain/block_stream.rs
@@ -703,18 +703,15 @@ impl<C: Blockchain> Stream for BlockStream<C> {
                 }
 
                 // Pausing after an error, before looking for more blocks
-                BlockStreamState::RetryAfterDelay(ref mut delay) => {
-                    match delay.as_mut().poll(cx) {
-                        Poll::Ready(Ok(..)) | Poll::Ready(Err(_)) => {
-                            self.state = BlockStreamState::BeginReconciliation;
-                        }
+                BlockStreamState::RetryAfterDelay(ref mut delay) => match delay.as_mut().poll(cx) {
+                    Poll::Ready(Ok(..)) | Poll::Ready(Err(_)) => {
+                        self.state = BlockStreamState::BeginReconciliation;
+                    }
 
-                        Poll::Pending => {
-                            // self.state = BlockStreamState::RetryAfterDelay(delay);
-                            break Poll::Pending;
-                        }
+                    Poll::Pending => {
+                        break Poll::Pending;
                     }
-                }
+                },
 
                 // Waiting for a chain head update
                 BlockStreamState::Idle => {

diff --git a/graphql/tests/query.rs b/graphql/tests/query.rs
@@ -1319,10 +1319,8 @@ fn subscription_gets_result_even_without_events() {
         let results: Vec<_> = stream
             .take(1)
             .collect()
-            // .map(Result::<_, ()>::Ok)
             .timeout(Duration::from_secs(3))
             .await
-            // .unwrap()
             .unwrap();
 
         assert_eq!(results.len(), 1);