Remove LedgerEvents trait

Passing around LedgerEventFutures directly allowed us to get rid of the
LedgerEvents helper trait, and define the htlc_* methods on
LedgerEventFutures directly.

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

Author: workflow

cnd/src/swap_protocols/rfc003/events/ledger_event_futures.rs

@@ -2,8 +2,7 @@ use crate::swap_protocols::{
     asset::Asset,
     rfc003::{
         events::{
-            Deployed, DeployedFuture, Funded, FundedFuture, HtlcEvents, LedgerEvents,
-            RedeemedOrRefundedFuture,
+            Deployed, DeployedFuture, Funded, FundedFuture, HtlcEvents, RedeemedOrRefundedFuture,
         },
         state_machine::HtlcParams,
         Ledger,
@@ -32,16 +31,14 @@ impl<L: Ledger, A: Asset> LedgerEventFutures<L, A> {
             htlc_redeemed_or_refunded: None,
         }
     }
-}
 
-impl<L: Ledger, A: Asset> LedgerEvents<L, A> for LedgerEventFutures<L, A> {
-    fn htlc_deployed(&mut self, htlc_params: HtlcParams<L, A>) -> &mut DeployedFuture<L> {
+    pub fn htlc_deployed(&mut self, htlc_params: HtlcParams<L, A>) -> &mut DeployedFuture<L> {
         let htlc_events = &self.htlc_events;
         self.htlc_deployed
             .get_or_insert_with(move || htlc_events.htlc_deployed(htlc_params))
     }
 
-    fn htlc_funded(
+    pub fn htlc_funded(
         &mut self,
         htlc_params: HtlcParams<L, A>,
         htlc_location: &Deployed<L>,
@@ -51,7 +48,7 @@ impl<L: Ledger, A: Asset> LedgerEvents<L, A> for LedgerEventFutures<L, A> {
             .get_or_insert_with(move || htlc_events.htlc_funded(htlc_params, htlc_location))
     }
 
-    fn htlc_redeemed_or_refunded(
+    pub fn htlc_redeemed_or_refunded(
         &mut self,
         htlc_params: HtlcParams<L, A>,
         htlc_deployment: &Deployed<L>,

cnd/src/swap_protocols/rfc003/events/mod.rs

@@ -51,23 +51,6 @@ pub type DeployedFuture<L: Ledger> = Future<Deployed<L>>;
 pub type FundedFuture<L: Ledger, A: Asset> = Future<Funded<L, A>>;
 pub type RedeemedOrRefundedFuture<L: Ledger> = Future<Either<Redeemed<L>, Refunded<L>>>;
 
-pub trait LedgerEvents<L: Ledger, A: Asset>: Send {
-    fn htlc_deployed(&mut self, htlc_params: HtlcParams<L, A>) -> &mut DeployedFuture<L>;
-
-    fn htlc_funded(
-        &mut self,
-        htlc_params: HtlcParams<L, A>,
-        htlc_deployment: &Deployed<L>,
-    ) -> &mut FundedFuture<L, A>;
-
-    fn htlc_redeemed_or_refunded(
-        &mut self,
-        htlc_params: HtlcParams<L, A>,
-        htlc_deployment: &Deployed<L>,
-        htlc_funding: &Funded<L, A>,
-    ) -> &mut RedeemedOrRefundedFuture<L>;
-}
-
 pub trait HtlcEvents<L: Ledger, A: Asset>: Send + Sync + 'static {
     fn htlc_deployed(&self, htlc_params: HtlcParams<L, A>) -> Box<DeployedFuture<L>>;
     fn htlc_funded(

cnd/src/swap_protocols/rfc003/state_machine.rs

@@ -6,7 +6,7 @@ use crate::{
         asset::Asset,
         rfc003::{
             self,
-            events::{self, Deployed, Funded, HtlcEvents, LedgerEventFutures, Redeemed, Refunded},
+            events::{Deployed, Funded, HtlcEvents, LedgerEventFutures, Redeemed, Refunded},
             ledger::Ledger,
             Accept, Request, SaveState, SecretHash,
         },
@@ -170,8 +170,8 @@ pub type FutureSwapOutcome<AL: Ledger, BL: Ledger, AA: Asset, BA: Asset> =
 
 #[allow(missing_debug_implementations)]
 pub struct Context<AL: Ledger, BL: Ledger, AA: Asset, BA: Asset> {
-    pub alpha_ledger_events: Box<dyn events::LedgerEvents<AL, AA>>,
-    pub beta_ledger_events: Box<dyn events::LedgerEvents<BL, BA>>,
+    pub alpha_ledger_events: LedgerEventFutures<AL, AA>,
+    pub beta_ledger_events: LedgerEventFutures<BL, BA>,
     pub state_repo: Arc<dyn SaveState<AL, BL, AA, BA>>,
 }
 
@@ -280,8 +280,8 @@ pub fn create_swap<AL: Ledger, BL: Ledger, AA: Asset, BA: Asset>(
     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 alpha_ledger_events = LedgerEventFutures::new(alpha_htlc_events);
+    let beta_ledger_events = LedgerEventFutures::new(beta_htlc_events);
     let id = request.swap_id;
 
     let (sender, receiver) = mpsc::unbounded();