fixup:

* Don't run supposedly useless plugin task * Join webserver task on shutdown * Wait for offer if not ready yet
fedimint · Jul 4, 2022 · 667ef48 · 667ef48
1 parent 2aaf4c5
commit 667ef48
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/client/client-lib/src/api.rs b/client/client-lib/src/api.rs
@@ -56,6 +56,7 @@ impl<'a> dyn FederationApi + 'a {
             }
         }
     }
+
     pub async fn await_output_outcome<T: TryIntoOutcome + Send>(
         &self,
         outpoint: OutPoint,
@@ -75,6 +76,26 @@ impl<'a> dyn FederationApi + 'a {
             .await
             .map_err(|_| ApiError::Timeout)?
     }
+
+    pub async fn await_offer(
+        &self,
+        payment_hash: Sha256Hash,
+        timeout: Duration,
+    ) -> Result<IncomingContractOffer> {
+        let poll = || async {
+            let interval = Duration::from_millis(100);
+            loop {
+                match self.fetch_offer(payment_hash).await {
+                    Ok(t) => return Ok(t),
+                    Err(e) if e.is_retryable() => minimint_api::task::sleep(interval).await,
+                    Err(e) => return Err(e),
+                }
+            }
+        };
+        minimint_api::task::timeout(timeout, poll())
+            .await
+            .map_err(|_| ApiError::Timeout)?
+    }
 }
 
 #[derive(Debug, Clone)]

diff --git a/client/client-lib/src/ln/mod.rs b/client/client-lib/src/ln/mod.rs
@@ -23,6 +23,7 @@ use minimint_core::modules::ln::{
     ContractAccount, ContractInput, ContractOrOfferOutput, ContractOutput,
 };
 use rand::{CryptoRng, RngCore};
+use std::time::Duration;
 use thiserror::Error;
 
 pub struct LnClient<'c> {
@@ -152,7 +153,7 @@ impl<'c> LnClient<'c> {
     pub async fn get_offer(&self, payment_hash: Sha256Hash) -> Result<IncomingContractOffer> {
         self.context
             .api
-            .fetch_offer(payment_hash)
+            .await_offer(payment_hash, Duration::from_secs(10))
             .await
             .map_err(LnClientError::ApiError)
     }

diff --git a/ln-gateway/src/bin/ln_gateway.rs b/ln-gateway/src/bin/ln_gateway.rs
@@ -165,7 +165,6 @@ async fn main() -> Result<(), Error> {
         .await?
     {
         let mut gateway = initialize_gateway(&plugin, sender, receiver).await;
-        tokio::spawn(async move { plugin.join().await });
         gateway.run().await.expect("gateway failed to run");
         Ok(())
     } else {

diff --git a/ln-gateway/src/lib.rs b/ln-gateway/src/lib.rs
@@ -215,8 +215,7 @@ impl LnGateway {
 impl Drop for LnGateway {
     fn drop(&mut self) {
         self.webserver.abort();
-        // FIXME: this panics ...
-        // assert!(futures::executor::block_on(&mut self.webserver).is_err());
+        let _ = futures::executor::block_on(&mut self.webserver);
     }
 }