Merge pull request #1012 from TheBlueMatt/2021-07-bump-deps
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Sat, 31 Jul 2021 20:42:59 +0000 (20:42 +0000)
committerGitHub <noreply@github.com>
Sat, 31 Jul 2021 20:42:59 +0000 (20:42 +0000)
Bump dependencies to bitcoin 0.27 and bech32 0.8

1  2 
lightning/src/ln/channelmanager.rs

index f4caa3edfe43fd317750adac832525ec5e5a149c,224581595442f2954b2ad698957b8433e7df0565..0aa3f1d0bef33d2dddb0fbf00ceea63bc11ef559
@@@ -5114,10 -5114,8 +5114,8 @@@ impl<'a, Signer: Sign, M: Deref, T: Der
  mod tests {
        use bitcoin::hashes::Hash;
        use bitcoin::hashes::sha256::Hash as Sha256;
-       use core::sync::atomic::{AtomicBool, Ordering};
        use core::time::Duration;
        use ln::{PaymentPreimage, PaymentHash, PaymentSecret};
-       use ln::channelmanager::PersistenceNotifier;
        use ln::features::{InitFeatures, InvoiceFeatures};
        use ln::functional_test_utils::*;
        use ln::msgs;
        use routing::router::{get_keysend_route, get_route};
        use util::events::{Event, MessageSendEvent, MessageSendEventsProvider};
        use util::test_utils;
-       use std::sync::Arc;
-       use std::thread;
  
        #[cfg(feature = "std")]
        #[test]
        fn test_wait_timeout() {
+               use ln::channelmanager::PersistenceNotifier;
+               use sync::Arc;
+               use core::sync::atomic::{AtomicBool, Ordering};
+               use std::thread;
                let persistence_notifier = Arc::new(PersistenceNotifier::new());
                let thread_notifier = Arc::clone(&persistence_notifier);
  
                let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
                let nodes = create_network(3, &node_cfgs, &node_chanmgrs);
  
 +              // All nodes start with a persistable update pending as `create_network` connects each node
 +              // with all other nodes to make most tests simpler.
 +              assert!(nodes[0].node.await_persistable_update_timeout(Duration::from_millis(1)));
 +              assert!(nodes[1].node.await_persistable_update_timeout(Duration::from_millis(1)));
 +              assert!(nodes[2].node.await_persistable_update_timeout(Duration::from_millis(1)));
 +
                let mut chan = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
  
                // We check that the channel info nodes have doesn't change too early, even though we try