f Don't pin futures

Author: tnull

.github/workflows/build.yml

@@ -20,43 +20,34 @@ jobs:
           - toolchain: stable
             build-net-tokio: true
             build-no-std: true
-            build-futures: true
           - toolchain: stable
             platform: macos-latest
             build-net-tokio: true
             build-no-std: true
-            build-futures: true
           - toolchain: beta
             platform: macos-latest
             build-net-tokio: true
             build-no-std: true
-            build-futures: true
           - toolchain: stable
             platform: windows-latest
             build-net-tokio: true
             build-no-std: true
-            build-futures: true
           - toolchain: beta
             platform: windows-latest
             build-net-tokio: true
             build-no-std: true
-            build-futures: true
           - toolchain: beta
             build-net-tokio: true
             build-no-std: true
-            build-futures: true
           - toolchain: 1.41.1
             build-no-std: false
             test-log-variants: true
-            build-futures: true
           - toolchain: 1.45.2
             build-net-old-tokio: true
             build-net-tokio: true
             build-no-std: false
-            build-futures: true
             coverage: true
           - toolchain: 1.47.0
-            build-futures: true
             build-no-std: true
     runs-on: ${{ matrix.platform }}
     steps:
@@ -146,7 +137,7 @@ jobs:
           cd lightning
           RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always --no-default-features --features no-std
       - name: Test futures builds on Rust ${{ matrix.toolchain }}
-        if: "matrix.build-futures && !matrix.coverage"
+        if: "!matrix.coverage"
         shell: bash # Default on Winblows is powershell
         run: |
           cd lightning-background-processor

lightning-background-processor/Cargo.toml

@@ -13,18 +13,14 @@ edition = "2018"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[features]
+futures = [ "futures-util" ]
+
 [dependencies]
 bitcoin = "0.29.0"
 lightning = { version = "0.0.111", path = "../lightning", features = ["std"] }
 lightning-rapid-gossip-sync = { version = "0.0.111", path = "../lightning-rapid-gossip-sync" }
-futures = { version = "=0.3.17", optional = true }
-futures-core = { version = "=0.3.17", optional = true }
-futures-task = { version = "=0.3.17", optional = true }
-futures-channel = { version = "=0.3.17", optional = true }
-futures-executor = { version = "=0.3.17", optional = true }
-futures-io = { version = "=0.3.17", optional = true }
-futures-sink = { version = "=0.3.17", optional = true }
-futures-util = { version = "=0.3.17", optional = true }
+futures-util = { version = "0.3", default-features = true, optional = true }
 
 [dev-dependencies]
 lightning = { version = "0.0.111", path = "../lightning", features = ["_test_utils"] }

lightning-background-processor/src/lib.rs

@@ -35,7 +35,7 @@ use std::time::{Duration, Instant};
 use std::ops::Deref;
 
 #[cfg(feature = "futures")]
-use futures::{select, future::FutureExt};
+use futures_util::{select, future::FutureExt};
 
 /// `BackgroundProcessor` takes care of tasks that (1) need to happen periodically to keep
 /// Rust-Lightning running properly, and (2) either can or should be run in the background. Its

lightning-block-sync/Cargo.toml

@@ -20,7 +20,7 @@ rpc-client = [ "serde", "serde_json", "chunked_transfer" ]
 [dependencies]
 bitcoin = "0.29.0"
 lightning = { version = "0.0.111", path = "../lightning" }
-futures = { version = "0.3" }
+futures-util = { version = "0.3", default-features = true }
 tokio = { version = "1.0", features = [ "io-util", "net", "time" ], optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
 serde_json = { version = "1.0", optional = true }

lightning-block-sync/src/rest.rs

@@ -7,7 +7,7 @@ use crate::http::{BinaryResponse, HttpEndpoint, HttpClient, JsonResponse};
 use bitcoin::hash_types::BlockHash;
 use bitcoin::hashes::hex::ToHex;
 
-use futures::lock::Mutex;
+use futures_util::lock::Mutex;
 
 use std::convert::TryFrom;
 use std::convert::TryInto;

lightning-block-sync/src/rpc.rs

@@ -7,7 +7,7 @@ use crate::http::{HttpClient, HttpEndpoint, HttpError, JsonResponse};
 use bitcoin::hash_types::BlockHash;
 use bitcoin::hashes::hex::ToHex;
 
-use futures::lock::Mutex;
+use futures_util::lock::Mutex;
 
 use serde_json;