Merge remote-tracking branch 'nervosnetwork/develop' into update-chan…

…nel-info-with-counterparty
nervosnetwork · Jan 10, 2025 · 75ed475 · 75ed475
2 parents dfb2683 + 5051443
commit 75ed475
Show file tree

Hide file tree

Showing 12 changed files with 802 additions and 716 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fnn"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -39,7 +39,7 @@ bitflags = { version = "2.5.0", features = ["serde"] }
 ckb-hash = "0.115.0"
 secp256k1 = { version = "0.28.0", features = ["serde", "recovery", "rand-std"] }
 musig2 = { version = "0.0.11", features = ["secp256k1", "serde"] }
-ractor = "=0.9.7"
+ractor = "0.14.2"
 arcode = "0.2.4"
 nom = "7.1.3"
 regex = "1.10.5"

diff --git a/src/actors.rs b/src/actors.rs
@@ -46,10 +46,14 @@ impl Actor for RootActor {
 
     async fn post_stop(
         &self,
-        _myself: ActorRef<Self::Msg>,
+        myself: ActorRef<Self::Msg>,
         _state: &mut Self::State,
     ) -> Result<(), ActorProcessingErr> {
         debug!("Root actor stopped");
+        myself
+            .get_cell()
+            .stop_children_and_wait(Some("Root actor stopped".to_string()), None)
+            .await;
         Ok(())
     }
 
@@ -68,7 +72,7 @@ impl Actor for RootActor {
                     debug!("Actor terminated for unknown reason (id: {:?})", who);
                 }
             },
-            SupervisionEvent::ActorPanicked(who, err) => {
+            SupervisionEvent::ActorFailed(who, err) => {
                 panic!("Actor unexpectedly panicked (id: {:?}): {:?}", who, err);
             }
             _ => {}