From f028ca662d642c198fe68e3fbe4fc2b1b6ae399f Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Fri, 1 Oct 2021 17:15:36 +1000
Subject: [PATCH] Don't take announcements from oracle for now

These are not yet set which means we cannot go through contract-setup
at the moment.
---
 daemon/src/maker_cfd.rs | 25 +++++++++++++------------
 daemon/src/taker_cfd.rs | 25 +++++++++++++------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/daemon/src/maker_cfd.rs b/daemon/src/maker_cfd.rs
index fd3c5b3..5c5042b 100644
--- a/daemon/src/maker_cfd.rs
+++ b/daemon/src/maker_cfd.rs
@@ -61,7 +61,7 @@ pub struct Actor {
     monitor_actor: Address<monitor::Actor<Actor>>,
     setup_state: SetupState,
     latest_announcement: Option<oracle::Announcement>,
-    oracle_actor: Address<oracle::Actor<Actor, monitor::Actor<Actor>>>,
+    _oracle_actor: Address<oracle::Actor<Actor, monitor::Actor<Actor>>>,
 }
 
 enum SetupState {
@@ -116,7 +116,7 @@ impl Actor {
             monitor_actor,
             setup_state: SetupState::None,
             latest_announcement: None,
-            oracle_actor,
+            _oracle_actor: oracle_actor,
         })
     }
 
@@ -336,17 +336,18 @@ impl Actor {
         self.cfd_feed_actor_inbox
             .send(load_all_cfds(&mut conn).await?)?;
 
-        let latest_announcement = self
-            .latest_announcement
-            .to_owned()
-            .context("Unaware of oracle's latest announcement.")?;
-        let nonce_pks = latest_announcement.nonce_pks;
+        // let latest_announcement = self
+        //     .latest_announcement
+        //     .to_owned()
+        //     .context("Unaware of oracle's latest announcement.")?;
 
-        self.oracle_actor
-            .do_send_async(oracle::MonitorEvent {
-                event_id: latest_announcement.id,
-            })
-            .await?;
+        // self.oracle_actor
+        //     .do_send_async(oracle::MonitorEvent {
+        //         event_id: latest_announcement.id,
+        //     })
+        //     .await?;
+
+        let nonce_pks = Vec::new();
 
         let contract_future = setup_contract::new(
             self.takers.clone().into_sink().with(move |msg| {
diff --git a/daemon/src/taker_cfd.rs b/daemon/src/taker_cfd.rs
index d990bc9..cd11c06 100644
--- a/daemon/src/taker_cfd.rs
+++ b/daemon/src/taker_cfd.rs
@@ -61,7 +61,7 @@ pub struct Actor {
     monitor_actor: Address<monitor::Actor<Actor>>,
     setup_state: SetupState,
     latest_announcement: Option<oracle::Announcement>,
-    oracle_actor: Address<oracle::Actor<Actor, monitor::Actor<Actor>>>,
+    _oracle_actor: Address<oracle::Actor<Actor, monitor::Actor<Actor>>>,
 }
 
 impl Actor {
@@ -107,7 +107,7 @@ impl Actor {
             monitor_actor,
             setup_state: SetupState::None,
             latest_announcement: None,
-            oracle_actor,
+            _oracle_actor: oracle_actor,
         })
     }
 
@@ -205,17 +205,18 @@ impl Actor {
             .send(load_all_cfds(&mut conn).await?)?;
         let cfd = load_cfd_by_order_id(order_id, &mut conn).await?;
 
-        let latest_announcement = self
-            .latest_announcement
-            .to_owned()
-            .context("Unaware of oracle's latest announcement.")?;
-        let nonce_pks = latest_announcement.nonce_pks;
+        // let latest_announcement = self
+        //     .latest_announcement
+        //     .to_owned()
+        //     .context("Unaware of oracle's latest announcement.")?;
 
-        self.oracle_actor
-            .do_send_async(oracle::MonitorEvent {
-                event_id: latest_announcement.id,
-            })
-            .await?;
+        // self.oracle_actor
+        //     .do_send_async(oracle::MonitorEvent {
+        //         event_id: latest_announcement.id,
+        //     })
+        //     .await?;
+
+        let nonce_pks = Vec::new();
 
         let contract_future = setup_contract::new(
             self.send_to_maker