mirror of
https://github.com/lightningdevkit/rust-lightning.git
synced 2025-01-18 21:34:48 +01:00
Fix build warnings
This commit is contained in:
parent
8408b8d0e4
commit
1d1323a3d0
@ -42,7 +42,7 @@ use lightning::ln::msgs::{self, DecodeError};
|
||||
use lightning::ln::script::ShutdownScript;
|
||||
use lightning::routing::gossip::{P2PGossipSync, NetworkGraph};
|
||||
use lightning::routing::utxo::UtxoLookup;
|
||||
use lightning::routing::router::{find_route, InFlightHtlcs, PaymentParameters, Route, RouteHop, RouteParameters, Router};
|
||||
use lightning::routing::router::{find_route, InFlightHtlcs, PaymentParameters, Route, RouteParameters, Router};
|
||||
use lightning::routing::scoring::FixedPenaltyScorer;
|
||||
use lightning::util::config::UserConfig;
|
||||
use lightning::util::errors::APIError;
|
||||
|
@ -33,7 +33,9 @@ use lightning::routing::gossip::{NetworkGraph, P2PGossipSync};
|
||||
use lightning::routing::utxo::UtxoLookup;
|
||||
use lightning::routing::router::Router;
|
||||
use lightning::routing::scoring::{Score, WriteableScore};
|
||||
use lightning::util::events::{Event, EventHandler, EventsProvider, PathFailure};
|
||||
use lightning::util::events::{Event, PathFailure};
|
||||
#[cfg(feature = "std")]
|
||||
use lightning::util::events::{EventHandler, EventsProvider};
|
||||
use lightning::util::logger::Logger;
|
||||
use lightning::util::persist::Persister;
|
||||
use lightning_rapid_gossip_sync::RapidGossipSync;
|
||||
|
@ -42,7 +42,7 @@ impl<NG: Deref<Target=NetworkGraph<L>>, L: Deref> RapidGossipSync<NG, L> where L
|
||||
&self,
|
||||
read_cursor: &mut R,
|
||||
) -> Result<u32, GraphSyncError> {
|
||||
#[allow(unused_mut)]
|
||||
#[allow(unused_mut, unused_assignments)]
|
||||
let mut current_time_unix = None;
|
||||
#[cfg(all(feature = "std", not(test)))]
|
||||
{
|
||||
|
@ -3982,7 +3982,7 @@ where
|
||||
None => None
|
||||
};
|
||||
|
||||
let mut peer_state_opt = counterparty_node_id_opt.as_ref().map(
|
||||
let peer_state_opt = counterparty_node_id_opt.as_ref().map(
|
||||
|counterparty_node_id| per_peer_state.get(counterparty_node_id).map(
|
||||
|peer_mutex| peer_mutex.lock().unwrap()
|
||||
)
|
||||
|
@ -276,7 +276,11 @@ pub(crate) struct PaymentAttemptsUsingTime<T: Time> {
|
||||
/// it means the result of the first attempt is not known yet.
|
||||
pub(crate) count: usize,
|
||||
/// This field is only used when retry is `Retry::Timeout` which is only build with feature std
|
||||
first_attempted_at: T
|
||||
#[cfg(not(feature = "no-std"))]
|
||||
first_attempted_at: T,
|
||||
#[cfg(feature = "no-std")]
|
||||
phantom: core::marker::PhantomData<T>,
|
||||
|
||||
}
|
||||
|
||||
#[cfg(not(any(feature = "no-std", test)))]
|
||||
@ -290,7 +294,10 @@ impl<T: Time> PaymentAttemptsUsingTime<T> {
|
||||
pub(crate) fn new() -> Self {
|
||||
PaymentAttemptsUsingTime {
|
||||
count: 0,
|
||||
first_attempted_at: T::now()
|
||||
#[cfg(not(feature = "no-std"))]
|
||||
first_attempted_at: T::now(),
|
||||
#[cfg(feature = "no-std")]
|
||||
phantom: core::marker::PhantomData,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -129,7 +129,7 @@ impl LockMetadata {
|
||||
// For each lock which is currently locked, check that no lock's locked-before
|
||||
// set includes the lock we're about to lock, which would imply a lockorder
|
||||
// inversion.
|
||||
for (locked_idx, locked) in held.borrow().iter() {
|
||||
for (locked_idx, _locked) in held.borrow().iter() {
|
||||
if *locked_idx == this.lock_idx {
|
||||
// Note that with `feature = "backtrace"` set, we may be looking at different
|
||||
// instances of the same lock. Still, doing so is quite risky, a total order
|
||||
@ -143,7 +143,7 @@ impl LockMetadata {
|
||||
panic!("Tried to acquire a lock while it was held!");
|
||||
}
|
||||
}
|
||||
for (locked_idx, locked) in held.borrow().iter() {
|
||||
for (_locked_idx, locked) in held.borrow().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")]
|
||||
|
@ -45,6 +45,7 @@ impl<T> FairRwLock<T> {
|
||||
self.lock.read()
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn try_write(&self) -> TryLockResult<RwLockWriteGuard<'_, T>> {
|
||||
self.lock.try_write()
|
||||
}
|
||||
|
@ -3,7 +3,6 @@ use crate::sync::debug_sync::{RwLock, Mutex};
|
||||
use super::{LockHeldState, LockTestExt};
|
||||
|
||||
use std::sync::Arc;
|
||||
use std::thread;
|
||||
|
||||
#[test]
|
||||
#[should_panic]
|
||||
|
Loading…
Reference in New Issue
Block a user