Merge #2029

2029: Heartbeat fixes questionmark r=da-kami a=da-kami Co-authored-by: Daniel Karzel <[email protected]>
get10101 · May 13, 2022 · e3d6f34 · e3d6f34
2 parents 68a1c2d + 158bf39
commit e3d6f34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/daemon/src/connection.rs b/daemon/src/connection.rs
@@ -236,7 +236,7 @@ impl Actor {
             heartbeat_measuring_rate: maker_heartbeat_interval.checked_div(2).expect("to divide"),
             maker_heartbeat_interval,
             heartbeat_timeout: maker_heartbeat_interval
-                .checked_mul(2)
+                .checked_mul(36)
                 .expect("to not overflow"),
             state: State::Disconnected,
             setup_actors: AddressMap::default(),

diff --git a/daemon/src/lib.rs b/daemon/src/lib.rs
@@ -175,19 +175,14 @@ where
         .create(None)
         .spawn(&mut tasks);
 
-        // Timeout happens when taker did not receive two consecutive heartbeats
-        let taker_heartbeat_timeout = maker_heartbeat_interval
-            .checked_mul(2)
-            .expect("not to overflow");
-
         tasks.add(
             connection_actor_ctx
                 .with_handler_timeout(Duration::from_secs(120))
                 .run(connection::Actor::new(
                     maker_online_status_feed_sender,
                     &cfd_actor_addr,
                     identity.identity_sk,
-                    taker_heartbeat_timeout,
+                    maker_heartbeat_interval,
                     connect_timeout,
                 )),
         );