fix: notify message blocking

nervosnetwork · Dec 10, 2022 · f4e20df · f4e20df
1 parent 5487461
commit f4e20df
Show file tree

Hide file tree

Showing 7 changed files with 255 additions and 56 deletions.
diff --git a/block-filter/src/filter.rs b/block-filter/src/filter.rs
@@ -31,15 +31,14 @@ impl BlockFilter {
             async_handle.spawn_blocking(move || filter_data_builder.build_filter_data());
 
         async_handle.spawn(async move {
-            let mut new_block_receiver = notify_controller
-                .subscribe_new_block(NAME.to_string())
-                .await;
+            let mut new_block_watcher = notify_controller.watch_new_block(NAME.to_string()).await;
             let _build_filter_data_finished = build_filter_data.await;
 
             loop {
                 tokio::select! {
-                    Some(_) = new_block_receiver.recv() => {
+                    Ok(_) = new_block_watcher.changed() => {
                         block_in_place(|| self.build_filter_data());
+                        new_block_watcher.borrow_and_update();
                     }
                     _ = &mut stop_rx => break,
                     else => break,