Merge pull request #1632 from TheBlueMatt/2022-07-warnings

Fix compilation warnings

Author: TheBlueMatt

lightning-invoice/src/payment.rs

@@ -1437,8 +1437,6 @@ mod tests {
 	enum TestResult {
 		PaymentFailure { path: Vec<RouteHop>, short_channel_id: u64 },
 		PaymentSuccess { path: Vec<RouteHop> },
-		ProbeFailure { path: Vec<RouteHop>, short_channel_id: u64 },
-		ProbeSuccess { path: Vec<RouteHop> },
 	}
 
 	impl TestScorer {
@@ -1474,12 +1472,6 @@ mod tests {
 					Some(TestResult::PaymentSuccess { path }) => {
 						panic!("Unexpected successful payment path: {:?}", path)
 					},
-					Some(TestResult::ProbeFailure { path, .. }) => {
-						panic!("Unexpected failed payment probe: {:?}", path)
-					},
-					Some(TestResult::ProbeSuccess { path }) => {
-						panic!("Unexpected successful payment probe: {:?}", path)
-					},
 					None => panic!("Unexpected payment_path_failed call: {:?}", actual_path),
 				}
 			}
@@ -1494,18 +1486,12 @@ mod tests {
 					Some(TestResult::PaymentSuccess { path }) => {
 						assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
 					},
-					Some(TestResult::ProbeFailure { path, .. }) => {
-						panic!("Unexpected failed payment probe: {:?}", path)
-					},
-					Some(TestResult::ProbeSuccess { path }) => {
-						panic!("Unexpected successful payment probe: {:?}", path)
-					},
 					None => panic!("Unexpected payment_path_successful call: {:?}", actual_path),
 				}
 			}
 		}
 
-		fn probe_failed(&mut self, actual_path: &[&RouteHop], actual_short_channel_id: u64) {
+		fn probe_failed(&mut self, actual_path: &[&RouteHop], _: u64) {
 			if let Some(expectations) = &mut self.expectations {
 				match expectations.pop_front() {
 					Some(TestResult::PaymentFailure { path, .. }) => {
@@ -1514,13 +1500,6 @@ mod tests {
 					Some(TestResult::PaymentSuccess { path }) => {
 						panic!("Unexpected successful payment path: {:?}", path)
 					},
-					Some(TestResult::ProbeFailure { path, short_channel_id }) => {
-						assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
-						assert_eq!(actual_short_channel_id, short_channel_id);
-					},
-					Some(TestResult::ProbeSuccess { path }) => {
-						panic!("Unexpected successful payment probe: {:?}", path)
-					},
 					None => panic!("Unexpected payment_path_failed call: {:?}", actual_path),
 				}
 			}
@@ -1534,12 +1513,6 @@ mod tests {
 					Some(TestResult::PaymentSuccess { path }) => {
 						panic!("Unexpected successful payment path: {:?}", path)
 					},
-					Some(TestResult::ProbeFailure { path, .. }) => {
-						panic!("Unexpected failed payment probe: {:?}", path)
-					},
-					Some(TestResult::ProbeSuccess { path }) => {
-						assert_eq!(actual_path, &path.iter().collect::<Vec<_>>()[..]);
-					},
 					None => panic!("Unexpected payment_path_successful call: {:?}", actual_path),
 				}
 			}

lightning/src/debug_sync.rs

@@ -68,7 +68,8 @@ struct LockMetadata {
 
 struct LockDep {
 	lock: Arc<LockMetadata>,
-	lockdep_trace: Backtrace,
+	/// lockdep_trace is unused unless we're building with `backtrace`, so we mark it _
+	_lockdep_trace: Backtrace,
 }
 
 #[cfg(feature = "backtrace")]
@@ -140,21 +141,21 @@ impl LockMetadata {
 					// of the same lock.
 					debug_assert!(cfg!(feature = "backtrace"), "Tried to acquire a lock while it was held!");
 				}
-				for (locked_dep_idx, locked_dep) in locked.locked_before.lock().unwrap().iter() {
+				for (locked_dep_idx, _locked_dep) in locked.locked_before.lock().unwrap().iter() {
 					if *locked_dep_idx == this.lock_idx && *locked_dep_idx != locked.lock_idx {
 						#[cfg(feature = "backtrace")]
 						panic!("Tried to violate existing lockorder.\nMutex that should be locked after the current lock was created at the following backtrace.\nNote that to get a backtrace for the lockorder violation, you should set RUST_BACKTRACE=1\nLock being taken constructed at: {} ({}):\n{:?}\nLock constructed at: {} ({})\n{:?}\n\nLock dep created at:\n{:?}\n\n",
 							get_construction_location(&this._lock_construction_bt), this.lock_idx, this._lock_construction_bt,
 							get_construction_location(&locked._lock_construction_bt), locked.lock_idx, locked._lock_construction_bt,
-							locked_dep.lockdep_trace);
+							_locked_dep._lockdep_trace);
 						#[cfg(not(feature = "backtrace"))]
 						panic!("Tried to violate existing lockorder. Build with the backtrace feature for more info.");
 					}
 				}
 				// Insert any already-held locks in our locked-before set.
 				let mut locked_before = this.locked_before.lock().unwrap();
 				if !locked_before.contains_key(&locked.lock_idx) {
-					let lockdep = LockDep { lock: Arc::clone(locked), lockdep_trace: Backtrace::new() };
+					let lockdep = LockDep { lock: Arc::clone(locked), _lockdep_trace: Backtrace::new() };
 					locked_before.insert(lockdep.lock.lock_idx, lockdep);
 				}
 			}
@@ -175,7 +176,7 @@ impl LockMetadata {
 			let mut locked_before = this.locked_before.lock().unwrap();
 			for (locked_idx, locked) in held.borrow().iter() {
 				if !locked_before.contains_key(locked_idx) {
-					let lockdep = LockDep { lock: Arc::clone(locked), lockdep_trace: Backtrace::new() };
+					let lockdep = LockDep { lock: Arc::clone(locked), _lockdep_trace: Backtrace::new() };
 					locked_before.insert(*locked_idx, lockdep);
 				}
 			}