diff --git a/Cargo.lock b/Cargo.lock index a278d1f27d..2c04238cae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -137,7 +137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -193,7 +193,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", ] [[package]] @@ -219,7 +219,7 @@ dependencies = [ "autocfg", "blocking", "cfg-if", - "event-listener", + "event-listener 2.5.3", "futures-lite", "rustix 0.37.23", "signal-hook", @@ -955,6 +955,17 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -2323,7 +2334,7 @@ dependencies = [ "derive_more", "ed25519-zebra", "either", - "event-listener", + "event-listener 3.0.0", "fnv", "futures-executor", "futures-lite", @@ -2376,7 +2387,7 @@ dependencies = [ "derive_more", "directories", "either", - "event-listener", + "event-listener 3.0.0", "fnv", "futures-channel", "futures-lite", @@ -2408,7 +2419,7 @@ dependencies = [ "derive_more", "either", "env_logger", - "event-listener", + "event-listener 3.0.0", "fnv", "futures-channel", "futures-lite", @@ -2439,7 +2450,7 @@ dependencies = [ "async-executor", "async-task", "derive_more", - "event-listener", + "event-listener 3.0.0", "fnv", "futures-lite", "futures-util", diff --git a/full-node/Cargo.toml b/full-node/Cargo.toml index 5ce84efec9..c23b55ba6d 100644 --- a/full-node/Cargo.toml +++ b/full-node/Cargo.toml @@ -21,7 +21,7 @@ ctrlc = "3.4.0" derive_more = "0.99.17" directories = "5.0.1" either = { version = "1.9.0", default-features = false } -event-listener = "2.5.3" +event-listener = "3.0.0" fnv = { version = "1.0.7", default-features = false } futures-channel = "0.3.27" futures-lite = { version = "1.13.0", default-features = false, features = ["alloc"] } diff --git a/full-node/src/json_rpc_service.rs b/full-node/src/json_rpc_service.rs index 21320e368c..f80b5e845a 100644 --- a/full-node/src/json_rpc_service.rs +++ b/full-node/src/json_rpc_service.rs @@ -250,7 +250,7 @@ struct JsonRpcBackground { tcp_listener: TcpListener, /// Event notified when the frontend is dropped. - on_service_dropped: event_listener::EventListener, + on_service_dropped: Pin>, /// See [`Config::tasks_executor`]. tasks_executor: Arc + Send>>) + Send + Sync>, diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 4913601c28..ac1c39138d 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -47,7 +47,7 @@ crossbeam-queue = { version = "0.3.8", default-features = false, features = ["al derive_more = "0.99.17" ed25519-zebra = { version = "4.0.1", default-features = false } either = { version = "1.9.0", default-features = false } -event-listener = { version = "2.5.3" } # TODO: no-std-ize +event-listener = { version = "3.0.0", default-features = false } fnv = { version = "1.0.7", default-features = false } futures-lite = { version = "1.13.0", default-features = false, features = ["alloc"] } hashbrown = { version = "0.14.0", default-features = false, features = ["serde"] } # TODO: remove serde feature diff --git a/lib/src/json_rpc/service/client_main_task.rs b/lib/src/json_rpc/service/client_main_task.rs index bc4b0d0e3e..dbccdc18f6 100644 --- a/lib/src/json_rpc/service/client_main_task.rs +++ b/lib/src/json_rpc/service/client_main_task.rs @@ -29,6 +29,7 @@ use async_lock::Mutex; use core::{ cmp, fmt, mem, num::NonZeroU32, + pin::Pin, sync::atomic::{AtomicBool, AtomicU32, Ordering}, }; use futures_lite::FutureExt as _; @@ -68,7 +69,7 @@ struct Inner { responses_notifications_queue: Arc, /// Event notified after the [`SerializedRequestsIo`] is destroyed. - on_serialized_requests_io_destroyed: event_listener::EventListener, + on_serialized_requests_io_destroyed: Pin>, } struct InnerSubscription { diff --git a/light-base/Cargo.toml b/light-base/Cargo.toml index 81af8912d1..aaa7699d68 100644 --- a/light-base/Cargo.toml +++ b/light-base/Cargo.toml @@ -19,7 +19,7 @@ base64 = { version = "0.21.2", default-features = false, features = ["alloc"] } blake2-rfc = { version = "0.2.18", default-features = false } derive_more = "0.99.17" either = { version = "1.9.0", default-features = false } -event-listener = { version = "2.5.3" } +event-listener = { version = "3.0.0", default-features = false } fnv = { version = "1.0.7", default-features = false } futures-channel = { version = "0.3.27", features = ["std", "sink"] } # TODO: no-std-ize and remove "sink" futures-lite = { version = "1.13.0", default-features = false, features = ["alloc"] } diff --git a/light-base/src/lib.rs b/light-base/src/lib.rs index 5987add185..e6392b73f3 100644 --- a/light-base/src/lib.rs +++ b/light-base/src/lib.rs @@ -310,7 +310,7 @@ pub struct JsonRpcResponses { inner: Option, /// Notified when the [`PublicApiChain`] is destroyed. - public_api_chain_destroyed: event_listener::EventListener, + public_api_chain_destroyed: pin::Pin>, } impl JsonRpcResponses { diff --git a/wasm-node/rust/Cargo.toml b/wasm-node/rust/Cargo.toml index 15238fcf68..58d8d8bbcf 100644 --- a/wasm-node/rust/Cargo.toml +++ b/wasm-node/rust/Cargo.toml @@ -16,7 +16,7 @@ crate-type = ["cdylib", "rlib"] async-executor = { version = "1.5.1", default-features = false } async-task = { version = "4.4.0", default-features = false } derive_more = "0.99.17" -event-listener = { version = "2.5.3" } +event-listener = { version = "3.0.0", default-features = false } fnv = { version = "1.0.7", default-features = false } futures-lite = { version = "1.13.0", default-features = false, features = ["alloc"] } futures-util = { version = "0.3.27", default-features = false } diff --git a/wasm-node/rust/src/platform.rs b/wasm-node/rust/src/platform.rs index 2fc525c540..88d370752c 100644 --- a/wasm-node/rust/src/platform.rs +++ b/wasm-node/rust/src/platform.rs @@ -1036,7 +1036,7 @@ pub(crate) fn connection_stream_opened( initial_writable_bytes, )); - connection.something_happened.notify(usize::max_value()) + connection.something_happened.notify(usize::max_value()); } else { panic!() }