Skip to content

Commit 3a3198f

Browse files
committed
graph: Rename spawn_blocking_ignore_panic
1 parent 0b05ab8 commit 3a3198f

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

chain/ethereum/tests/network_indexer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fn run_network_indexer(
7676
let (event_sink, event_stream) = futures::sync::mpsc::channel(100);
7777

7878
// Run network indexer and forward its events to the channel
79-
tokio::spawn(
79+
graph::spawn(
8080
indexer
8181
.take_event_stream()
8282
.expect("failed to take stream from indexer")

graph/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub mod mock {
2121

2222
/// Wrapper for spawning tasks that abort on panic, which is our default.
2323
mod task_spawn;
24-
pub use task_spawn::{spawn, spawn_blocking, spawn_blocking_ignore_panic};
24+
pub use task_spawn::{spawn, spawn_blocking, spawn_blocking_allow_panic};
2525

2626
/// A prelude that makes all system component traits and data types available.
2727
///

graph/src/task_spawn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn spawn_blocking<T: Send + 'static>(
2424
tokio::task::spawn_blocking(move || block_on(abort_on_panic(f)))
2525
}
2626

27-
pub fn spawn_blocking_ignore_panic<T: Send + 'static>(
27+
pub fn spawn_blocking_allow_panic<T: Send + 'static>(
2828
f: impl Future03<Output = T> + Send + 'static,
2929
) -> JoinHandle<T> {
3030
tokio::task::spawn_blocking(move || block_on(f))

runtime/wasm/src/host_exports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,5 +680,5 @@ fn test_string_to_h160_with_0x() {
680680
fn block_on<I: Send + 'static, ER: Send + 'static>(
681681
future: impl Future<Item = I, Error = ER> + Send + 'static,
682682
) -> Result<I, ER> {
683-
tokio::spawn(future.compat()).compat().wait().unwrap()
683+
graph::spawn_blocking_allow_panic(future.compat()).compat().wait().unwrap()
684684
}

server/websocket/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ uuid = { version = "0.7.2", features = ["v4"] }
1717

1818
# Needed for compatibility with tokio-tungstenite
1919
tokio01 = { version = "0.1.7", package = "tokio" }
20-
tokio-io = "0.1.7"
20+
tokio-io = "0.1.7"

server/websocket/src/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ where
190190
ws_stream,
191191
graphql_runner.clone(),
192192
);
193-
graph::spawn_blocking_ignore_panic(service.into_future().compat());
193+
graph::spawn_blocking_allow_panic(service.into_future().compat());
194194
}
195195
Err(e) => {
196196
// We gracefully skip over failed connection attempts rather

0 commit comments

Comments
 (0)