Fedimint cleanup

Author: AnthonyRonning

mutiny-core/src/federation.rs

@@ -5,7 +5,6 @@ use crate::{
     nodemanager::MutinyInvoice,
     onchain::coin_type_from_network,
     sql::{glue::GlueDB, ApplicationStore},
-    storage::MutinyStorage,
     utils::{self, sleep},
     ActivityItem, HTLCStatus, DEFAULT_PAYMENT_TIMEOUT,
 };
@@ -46,11 +45,7 @@ use futures_util::{pin_mut, StreamExt};
 use lightning::{log_debug, log_error, log_info, log_trace, log_warn, util::logger::Logger};
 use lightning_invoice::Bolt11Invoice;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use std::{
-    collections::HashMap,
-    fmt::Debug,
-    sync::{atomic::AtomicBool, Arc, RwLock},
-};
+use std::{collections::HashMap, fmt::Debug, sync::Arc};
 
 // The amount of time in milliseconds to wait for
 // checking the status of a fedimint payment. This
@@ -133,44 +128,25 @@ pub struct FedimintBalance {
     pub amount: u64,
 }
 
-// TODO remove
-#[allow(dead_code)]
-pub(crate) struct FederationClient<S: MutinyStorage> {
+pub(crate) struct FederationClient {
     pub(crate) uuid: String,
-    pub(crate) federation_index: FederationIndex,
-    pub(crate) federation_code: InviteCode,
     pub(crate) fedimint_client: ClientArc,
-    stopped_components: Arc<RwLock<Vec<bool>>>,
-    storage: S,
     g: GlueDB,
-    network: Network,
     pub(crate) logger: Arc<MutinyLogger>,
-    stop: Arc<AtomicBool>,
 }
 
-// TODO remove
-#[allow(dead_code)]
-impl<S: MutinyStorage> FederationClient<S> {
+impl FederationClient {
     #[allow(clippy::too_many_arguments)]
     pub(crate) async fn new(
         uuid: String,
-        federation_index: &FederationIndex,
         federation_code: InviteCode,
         xprivkey: ExtendedPrivKey,
-        storage: S,
         g: GlueDB,
         network: Network,
         logger: Arc<MutinyLogger>,
-        stop: Arc<AtomicBool>,
     ) -> Result<Self, MutinyError> {
         log_info!(logger, "initializing a new federation client: {uuid}");
 
-        // a list of components that need to be stopped and whether or not they are stopped
-        // TODO remove this if we end up not needing to stop things
-        let stopped_components = Arc::new(RwLock::new(vec![]));
-
-        log_info!(logger, "Joining federation {}", federation_code);
-
         let federation_info = FederationInfo::from_invite_code(federation_code.clone()).await?;
 
         let mut client_builder = fedimint_client::Client::builder();
@@ -201,15 +177,9 @@ impl<S: MutinyStorage> FederationClient<S> {
         log_debug!(logger, "Built fedimint client");
         Ok(FederationClient {
             uuid,
-            federation_index: federation_index.clone(),
-            federation_code,
             fedimint_client,
-            stopped_components,
-            storage,
             g,
-            network,
             logger,
-            stop,
         })
     }
 

mutiny-core/src/lib.rs

@@ -287,7 +287,7 @@ pub struct MutinyWallet<S: MutinyStorage> {
     pub node_manager: Arc<NodeManager<S>>,
     pub nostr: Arc<NostrManager<S>>,
     pub federation_storage: Arc<Mutex<FederationStorage>>,
-    pub(crate) federations: Arc<Mutex<HashMap<FederationId, Arc<FederationClient<S>>>>>,
+    pub(crate) federations: Arc<Mutex<HashMap<FederationId, Arc<FederationClient>>>>,
     pub stop: Arc<AtomicBool>,
     pub logger: Arc<MutinyLogger>,
 }
@@ -343,7 +343,7 @@ impl<S: MutinyStorage> MutinyWallet<S> {
 
         // create federation library
         let (federation_storage, federations) =
-            create_federations(&storage, &config, glue_db.clone(), &logger, stop.clone()).await?;
+            create_federations(&storage, &config, glue_db.clone(), &logger).await?;
         let federation_storage = Arc::new(Mutex::new(federation_storage));
         let federations = federations;
 
@@ -1031,7 +1031,6 @@ impl<S: MutinyStorage> MutinyWallet<S> {
             self.federation_storage.clone(),
             self.federations.clone(),
             federation_code,
-            self.stop.clone(),
         )
         .await
     }
@@ -1121,11 +1120,10 @@ async fn create_federations<S: MutinyStorage>(
     c: &MutinyWalletConfig,
     g: GlueDB,
     logger: &Arc<MutinyLogger>,
-    stop: Arc<AtomicBool>,
 ) -> Result<
     (
         FederationStorage,
-        Arc<Mutex<HashMap<FederationId, Arc<FederationClient<S>>>>>,
+        Arc<Mutex<HashMap<FederationId, Arc<FederationClient>>>>,
     ),
     MutinyError,
 > {
@@ -1135,14 +1133,11 @@ async fn create_federations<S: MutinyStorage>(
     for federation_item in federations {
         let federation = FederationClient::new(
             federation_item.0,
-            &federation_item.1,
             federation_item.1.federation_code.clone(),
             c.xprivkey,
-            storage.clone(),
             g.clone(),
             c.network,
             logger.clone(),
-            stop.clone(),
         )
         .await?;
 
@@ -1163,9 +1158,8 @@ pub(crate) async fn create_new_federation<S: MutinyStorage>(
     network: Network,
     logger: Arc<MutinyLogger>,
     federation_storage: Arc<Mutex<FederationStorage>>,
-    federations: Arc<Mutex<HashMap<FederationId, Arc<FederationClient<S>>>>>,
+    federations: Arc<Mutex<HashMap<FederationId, Arc<FederationClient>>>>,
     federation_code: InviteCode,
-    stop: Arc<AtomicBool>,
 ) -> Result<FederationIdentity, MutinyError> {
     // Begin with a mutex lock so that nothing else can
     // save or alter the federation list while it is about to
@@ -1201,14 +1195,11 @@ pub(crate) async fn create_new_federation<S: MutinyStorage>(
     // now create the federation process and init it
     let new_federation = FederationClient::new(
         next_federation_uuid.clone(),
-        &next_federation,
         federation_code,
         xprivkey,
-        storage.clone(),
         g.clone(),
         network,
         logger.clone(),
-        stop,
     )
     .await?;
 

mutiny-core/src/sql/glue.rs

@@ -125,7 +125,6 @@ impl GlueDB {
 }
 
 impl ApplicationStore for GlueDB {
-    #[cfg_attr(not(target_arch = "wasm32"), allow(dead_code, unused_variables))]
     async fn save_payment(&self, invoice: MutinyInvoice) -> Result<(), MutinyError> {
         #[cfg(not(target_arch = "wasm32"))]
         unimplemented!("can't run on servers until Send is supported in Glue");
@@ -201,7 +200,6 @@ impl ApplicationStore for GlueDB {
         }
     }
 
-    #[cfg_attr(not(target_arch = "wasm32"), allow(dead_code, unused_variables))]
     async fn get_payment(
         &self,
         payment_hash: &bitcoin::hashes::sha256::Hash,
@@ -255,7 +253,6 @@ impl ApplicationStore for GlueDB {
         }
     }
 
-    #[cfg_attr(not(target_arch = "wasm32"), allow(dead_code, unused_variables))]
     async fn update_payment_status(
         &self,
         payment_hash: &bitcoin::hashes::sha256::Hash,
@@ -284,7 +281,6 @@ impl ApplicationStore for GlueDB {
         }
     }
 
-    #[cfg_attr(not(target_arch = "wasm32"), allow(dead_code, unused_variables))]
     async fn update_payment_fee(
         &self,
         payment_hash: &bitcoin::hashes::sha256::Hash,
@@ -316,7 +312,6 @@ impl ApplicationStore for GlueDB {
         }
     }
 
-    #[cfg_attr(not(target_arch = "wasm32"), allow(dead_code, unused_variables))]
     async fn update_payment_preimage(
         &self,
         payment_hash: &bitcoin::hashes::sha256::Hash,
@@ -348,7 +343,6 @@ impl ApplicationStore for GlueDB {
         }
     }
 
-    #[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
     async fn list_payments(&self) -> Result<Vec<MutinyInvoice>, MutinyError> {
         #[cfg(not(target_arch = "wasm32"))]
         unimplemented!("can't run on servers until Send is supported in Glue");
@@ -382,7 +376,6 @@ impl ApplicationStore for GlueDB {
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
 fn parse_row_to_invoice(
     row: Vec<Value>,
     logger: Arc<MutinyLogger>,
@@ -598,7 +591,6 @@ impl IRawDatabase for FedimintDB {
     }
 }
 
-#[cfg_attr(not(target_arch = "wasm32"), allow(dead_code))]
 pub struct GluePseudoTransaction<'a> {
     #[cfg(not(target_arch = "wasm32"))]
     pub(crate) db: Arc<Mutex<Glue<MemoryStorage>>>,

mutiny-core/src/sql/mod.rs

@@ -1,3 +1,7 @@
+#![cfg_attr(
+    not(target_arch = "wasm32"),
+    allow(unused_variables, dead_code, unused_imports)
+)]
 use crate::{error::MutinyError, nodemanager::MutinyInvoice, HTLCStatus};
 
 pub mod glue;