Merge pull request #14 from bradleystachurski/fix-build

fix: remove tokio unstable to resolve tokio builder errors
elsirion · May 15, 2024 · a4507fd · a4507fd
2 parents 09f93e6 + e872242
commit a4507fd
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 62 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,10 +6,10 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-fedimint-core = "0.3.0-rc.3"
-fedimint-ln-common = "0.3.0-rc.3"
-fedimint-mint-common = "0.3.0-rc.3"
-fedimint-wallet-common = "0.3.0-rc.3"
+fedimint-core = { git = "https://github.com/fedimint/fedimint", rev = "38f593728a38284cc3365b7288294df7bc696273" }
+fedimint-ln-common = { git = "https://github.com/fedimint/fedimint", rev = "38f593728a38284cc3365b7288294df7bc696273" }
+fedimint-mint-common = { git = "https://github.com/fedimint/fedimint", rev = "38f593728a38284cc3365b7288294df7bc696273" }
+fedimint-wallet-common = { git = "https://github.com/fedimint/fedimint", rev = "38f593728a38284cc3365b7288294df7bc696273" }
 
 anyhow = "1.0.81"
 async-stream = "0.3.5"

diff --git a/flake.nix b/flake.nix
@@ -18,10 +18,7 @@
         lib = pkgs.lib;
         stdenv = pkgs.stdenv;
 
-        toolchainArgs = {
-          extraRustFlags = "--cfg tokio_unstable";
-        };
-        stdToolchains = flakeboxLib.mkStdToolchains toolchainArgs;
+        stdToolchains = flakeboxLib.mkStdToolchains { };
 
         rustSrc = flakeboxLib.filterSubPaths {
           root = builtins.path {

diff --git a/src/federation/observer.rs b/src/federation/observer.rs
@@ -8,7 +8,7 @@ use fedimint_core::encoding::Encodable;
 use fedimint_core::epoch::ConsensusItem;
 use fedimint_core::session_outcome::SessionOutcome;
 use fedimint_core::task::TaskGroup;
-use fedimint_core::util::retry;
+use fedimint_core::util::{retry, ConstantBackoff};
 use fedimint_core::{Amount, PeerId};
 use fedimint_ln_common::contracts::{Contract, IdentifiableContract};
 use fedimint_ln_common::{LightningInput, LightningOutput, LightningOutputV0};
@@ -222,13 +222,14 @@ impl FederationObserver {
                 async move {
                     let signed_session_outcome = retry(
                         format!("Waiting for session {session_index}"),
+                        ConstantBackoff::default()
+                            .with_delay(Duration::from_secs(1))
+                            .with_max_times(usize::MAX),
                         || async {
                             api_fetch_single
                                 .await_block(session_index, &decoders_single)
                                 .await
                         },
-                        Duration::from_secs(1),
-                        u32::MAX,
                     )
                     .await
                     .expect("Will fail after 136 years");