From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Fri, 20 Aug 2021 18:06:58 +0000 (+0000)
Subject: Merge pull request #1051 from JosephGoulden/fix_ping_disconnect
X-Git-Tag: v0.0.101~32
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2ced708b71600e99e53ef526d5b4508c784208f9;hp=af4eb23a1cd56959a792dfa5c57723818f538713;p=rust-lightning

Merge pull request #1051 from JosephGoulden/fix_ping_disconnect

fix: peer is disconnected for not responding to ping
---

diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs
index 980c6ea4..13289395 100644
--- a/lightning/src/ln/functional_tests.rs
+++ b/lightning/src/ln/functional_tests.rs
@@ -4048,7 +4048,7 @@ fn test_invalid_channel_announcement() {
 				bitcoin_key_1: if were_node_one { as_bitcoin_key } else { bs_bitcoin_key },
 				bitcoin_key_2: if were_node_one { bs_bitcoin_key } else { as_bitcoin_key },
 				excess_data: Vec::new(),
-			};
+			}
 		}
 	}
 
diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 234b5095..8ca7532a 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -739,7 +739,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref> PeerManager<D
 												},
 											}
 										}
-									};
+									}
 								}
 							}
 
diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index 3ac294fb..9644411b 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -160,7 +160,7 @@ macro_rules! log_spendable {
 #[macro_export]
 macro_rules! log_internal {
 	($logger: expr, $lvl:expr, $($arg:tt)+) => (
-		$logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
+		$logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()))
 	);
 }