lukechilds
/
itchysats
mirror of https://github.com/lukechilds/itchysats.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Don't take announcements from oracle for now 

These are not yet set which means we cannot go through contract-setup
at the moment.
upload-correct-windows-binary
Thomas Eizinger 3 years ago
parent
a9cad7ec3e
commit
f028ca662d
No known key found for this signature in database GPG Key ID: 651AC83A6C6C8B96
2 changed files with 26 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      daemon/src/maker_cfd.rs
  2. 25
      daemon/src/taker_cfd.rs

25
daemon/src/maker_cfd.rs
View File

@ -61,7 +61,7 @@ pub struct Actor {
monitor_actor: Address<monitor::Actor<Actor>>, monitor_actor: Address<monitor::Actor<Actor>>,
setup_state: SetupState, setup_state: SetupState,
latest_announcement: Option<oracle::Announcement>, 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 { enum SetupState {
@ -116,7 +116,7 @@ impl Actor {
monitor_actor, monitor_actor,
setup_state: SetupState::None, setup_state: SetupState::None,
latest_announcement: None, latest_announcement: None,
oracle_actor, _oracle_actor: oracle_actor,
}) })
} }
@ -336,17 +336,18 @@ impl Actor {
self.cfd_feed_actor_inbox self.cfd_feed_actor_inbox
.send(load_all_cfds(&mut conn).await?)?; .send(load_all_cfds(&mut conn).await?)?;
let latest_announcement = self // let latest_announcement = self
.latest_announcement // .latest_announcement
.to_owned() // .to_owned()
.context("Unaware of oracle's latest announcement.")?; // .context("Unaware of oracle's latest announcement.")?;
let nonce_pks = latest_announcement.nonce_pks;
self.oracle_actor // self.oracle_actor
.do_send_async(oracle::MonitorEvent { // .do_send_async(oracle::MonitorEvent {
event_id: latest_announcement.id, // event_id: latest_announcement.id,
}) // })
.await?; // .await?;
let nonce_pks = Vec::new();
let contract_future = setup_contract::new( let contract_future = setup_contract::new(
self.takers.clone().into_sink().with(move |msg| { self.takers.clone().into_sink().with(move |msg| {

25
daemon/src/taker_cfd.rs
View File

@ -61,7 +61,7 @@ pub struct Actor {
monitor_actor: Address<monitor::Actor<Actor>>, monitor_actor: Address<monitor::Actor<Actor>>,
setup_state: SetupState, setup_state: SetupState,
latest_announcement: Option<oracle::Announcement>, 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 { impl Actor {
@ -107,7 +107,7 @@ impl Actor {
monitor_actor, monitor_actor,
setup_state: SetupState::None, setup_state: SetupState::None,
latest_announcement: None, latest_announcement: None,
oracle_actor, _oracle_actor: oracle_actor,
}) })
} }
@ -205,17 +205,18 @@ impl Actor {
.send(load_all_cfds(&mut conn).await?)?; .send(load_all_cfds(&mut conn).await?)?;
let cfd = load_cfd_by_order_id(order_id, &mut conn).await?; let cfd = load_cfd_by_order_id(order_id, &mut conn).await?;
let latest_announcement = self // let latest_announcement = self
.latest_announcement // .latest_announcement
.to_owned() // .to_owned()
.context("Unaware of oracle's latest announcement.")?; // .context("Unaware of oracle's latest announcement.")?;
let nonce_pks = latest_announcement.nonce_pks;
self.oracle_actor // self.oracle_actor
.do_send_async(oracle::MonitorEvent { // .do_send_async(oracle::MonitorEvent {
event_id: latest_announcement.id, // event_id: latest_announcement.id,
}) // })
.await?; // .await?;
let nonce_pks = Vec::new();
let contract_future = setup_contract::new( let contract_future = setup_contract::new(
self.send_to_maker self.send_to_maker

Write Preview
Loading…
Cancel
Save