Pass HtlcEvents to create_swap directly

This is part of an ongoing refactor towards removing the
LedgerEventFutures indirection.

Co-authored-by: Tobin Harding <tobin.harding@tenx.tech>

Author: workflow

cnd/src/lib.rs

@@ -37,7 +37,7 @@ pub mod timestamp;
 
 use crate::swap_protocols::{
     asset::Asset,
-    rfc003::{events::LedgerEvents, Ledger},
+    rfc003::{events::HtlcEvents, Ledger},
 };
 use anyhow::Context;
 use directories::ProjectDirs;
@@ -69,5 +69,5 @@ pub fn data_dir() -> Option<PathBuf> {
 }
 
 pub trait CreateLedgerEvents<L: Ledger, A: Asset> {
-    fn create_ledger_events(&self) -> Box<dyn LedgerEvents<L, A>>;
+    fn create_ledger_events(&self) -> Box<dyn HtlcEvents<L, A>>;
 }

cnd/src/swap_protocols/facade.rs

@@ -12,7 +12,7 @@ use crate::{
         ledger::{Bitcoin, Ethereum},
         rfc003::{
             self,
-            events::{HtlcEvents, LedgerEventFutures, LedgerEvents},
+            events::HtlcEvents,
             state_machine::SwapStates,
             state_store::{self, InMemoryStateStore, StateStore},
             ActorState, Ledger,
@@ -181,10 +181,8 @@ impl<S> CreateLedgerEvents<Bitcoin, Amount> for Facade<S>
 where
     S: Send + Sync + 'static,
 {
-    fn create_ledger_events(&self) -> Box<dyn LedgerEvents<Bitcoin, Amount>> {
-        Box::new(LedgerEventFutures::new(Box::new(
-            self.bitcoin_connector.clone(),
-        )))
+    fn create_ledger_events(&self) -> Box<dyn HtlcEvents<Bitcoin, Amount>> {
+        Box::new(self.bitcoin_connector.clone())
     }
 }
 
@@ -194,10 +192,8 @@ where
     A: Asset + Send + Sync + 'static,
     Web3Connector: HtlcEvents<Ethereum, A>,
 {
-    fn create_ledger_events(&self) -> Box<dyn LedgerEvents<Ethereum, A>> {
-        Box::new(LedgerEventFutures::new(Box::new(
-            self.ethereum_connector.clone(),
-        )))
+    fn create_ledger_events(&self) -> Box<dyn HtlcEvents<Ethereum, A>> {
+        Box::new(self.ethereum_connector.clone())
     }
 }
 

cnd/src/swap_protocols/rfc003/state_machine.rs

@@ -6,7 +6,7 @@ use crate::{
         asset::Asset,
         rfc003::{
             self,
-            events::{self, Deployed, Funded, LedgerEvents, Redeemed, Refunded},
+            events::{self, Deployed, Funded, HtlcEvents, LedgerEventFutures, Redeemed, Refunded},
             ledger::Ledger,
             Accept, Request, SaveState, SecretHash,
         },
@@ -272,14 +272,16 @@ pub enum Swap<AL: Ledger, BL: Ledger, AA: Asset, BA: Asset> {
 }
 
 pub fn create_swap<AL: Ledger, BL: Ledger, AA: Asset, BA: Asset>(
-    alpha_ledger_events: Box<dyn LedgerEvents<AL, AA>>,
-    beta_ledger_events: Box<dyn LedgerEvents<BL, BA>>,
+    alpha_htlc_events: Box<dyn HtlcEvents<AL, AA>>,
+    beta_htlc_events: Box<dyn HtlcEvents<BL, BA>>,
     request: Request<AL, BL, AA, BA>,
     accept: Accept<AL, BL>,
 ) -> (
     impl Future<Item = (), Error = ()> + Send + 'static,
     impl Stream<Item = SwapStates<AL, BL, AA, BA>, Error = ()> + Send + 'static,
 ) {
+    let alpha_ledger_events = Box::new(LedgerEventFutures::new(alpha_htlc_events));
+    let beta_ledger_events = Box::new(LedgerEventFutures::new(beta_htlc_events));
     let id = request.swap_id;
 
     let (sender, receiver) = mpsc::unbounded();