Handle retrying sign_counterparty_commitment outb funding failures

[rust-lightning] / lightning-net-tokio / src / lib.rs

diff --git a/lightning-net-tokio/src/lib.rs b/lightning-net-tokio/src/lib.rs
index 06aed3194f9bc18e27d146ea9cbedc23604edfe8..bac18b2b398cac33ebbb9523fc0a2811da914b75 100644 (file)
--- a/lightning-net-tokio/src/lib.rs
+++ b/lightning-net-tokio/src/lib.rs
@@ -31,10 +31,9 @@
 
 use bitcoin::secp256k1::PublicKey;
 
-use tokio::net::{tcp, TcpStream};
-use tokio::{io, time};
+use tokio::net::TcpStream;
+use tokio::time;
 use tokio::sync::mpsc;
-use tokio::io::AsyncWrite;
 
 use lightning::ln::peer_handler;
 use lightning::ln::peer_handler::SocketDescriptor as LnSocketTrait;
@@ -231,7 +230,7 @@ impl Connection {
                                                        // readable() is allowed to spuriously wake, so we have to handle
                                                        // WouldBlock here.
                                                },
-                                               Err(e) => break Disconnect::PeerDisconnected,
+                                               Err(_) => break Disconnect::PeerDisconnected,
                                        }
                                },
                        }
@@ -493,10 +492,10 @@ impl peer_handler::SocketDescriptor for SocketDescriptor {
                                                        written_len += res;
                                                        if written_len == data.len() { return written_len; }
                                                },
-                                               Err(e) => return written_len,
+                                               Err(_) => return written_len,
                                        }
                                },
-                               task::Poll::Ready(Err(e)) => return written_len,
+                               task::Poll::Ready(Err(_)) => return written_len,
                                task::Poll::Pending => {
                                        // We're queued up for a write event now, but we need to make sure we also
                                        // pause read given we're now waiting on the remote end to ACK (and in
@@ -631,7 +630,7 @@ mod tests {
                fn handle_error(&self, _their_node_id: &PublicKey, _msg: &ErrorMessage) {}
                fn provided_node_features(&self) -> NodeFeatures { NodeFeatures::empty() }
                fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures { InitFeatures::empty() }
-               fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
+               fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
                        Some(vec![ChainHash::using_genesis_block(Network::Testnet)])
                }
        }