Stop contract and rollover from the maker if cannot notify the taker

As for now, we were only logging the communication problem and moving on.

daemon/src/maker_cfd.rs

@@ -8,7 +8,6 @@ use crate::model::cfd::{
 };
 use crate::model::{TakerId, Usd};
 use crate::monitor::MonitorParams;
-use crate::tokio_ext::spawn_fallible;
 use crate::wallet::Wallet;
 use crate::{log_error, maker_inc_connections, monitor, oracle, setup_contract, wire};
 use anyhow::{Context as _, Result};
@@ -575,18 +574,12 @@ where
         // Use `.send` here to ensure we only continue once the message has been sent
         // Nothing done after this call should be able to fail, otherwise we notified the taker, but
         // might not transition to `Active` ourselves!
-        spawn_fallible::<_, anyhow::Error>({
+        self.takers
-            let takers = self.takers.clone();
+            .send(maker_inc_connections::TakerMessage {
-            async move {
+                taker_id,
-                takers
+                command: TakerCommand::NotifyOrderAccepted { id: order_id },
-                    .send(maker_inc_connections::TakerMessage {
+            })
-                        taker_id,
+            .await??;
-                        command: TakerCommand::NotifyOrderAccepted { id: order_id },
-                    })
-                    .await??;
-                Ok(())
-            }
-        });
 
         // 5. Spawn away the contract setup
         let (sender, receiver) = mpsc::unbounded();
@@ -758,22 +751,15 @@ where
             .await?
             .with_context(|| format!("Announcement {} not found", oracle_event_id))?;
 
-        spawn_fallible::<_, anyhow::Error>({
+        self.takers
-            let takers = self.takers.clone();
+            .send(maker_inc_connections::TakerMessage {
-            let order_id = proposal.order_id;
+                taker_id,
-            async move {
+                command: TakerCommand::NotifyRollOverAccepted {
-                takers
+                    id: proposal.order_id,
-                    .send(maker_inc_connections::TakerMessage {
+                    oracle_event_id,
-                        taker_id,
+                },
-                        command: TakerCommand::NotifyRollOverAccepted {
+            })
-                            id: order_id,
+            .await??;
-                            oracle_event_id,
-                        },
-                    })
-                    .await??;
-                Ok(())
-            }
-        });
 
         self.oracle_actor
             .do_send_async(oracle::MonitorAttestation {