Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use bip39::Mnemonic;
use bitcoin::bip32::{ChildNumber, Xpriv};
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};
use chrono::Local;
use lightning::chain::{chainmonitor, BestBlock, Watch};
use lightning::io::Cursor;
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
Expand All @@ -40,7 +41,6 @@ use lightning::util::persist::{
SCORER_PERSISTENCE_KEY, SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
};

use lightning::util::ser::ReadableArgs;
use lightning::util::sweep::OutputSweeper;
use lightning_persister::fs_store::FilesystemStore;
Expand Down Expand Up @@ -84,7 +84,6 @@ use crate::types::{
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
use crate::{Node, NodeMetrics};
use chrono::Local;

const VSS_HARDENED_CHILD_INDEX: u32 = 877;
const VSS_LNURL_AUTH_HARDENED_CHILD_INDEX: u32 = 138;
Expand Down
10 changes: 5 additions & 5 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,22 @@ pub(crate) const NODE_ANN_BCAST_INTERVAL: Duration = Duration::from_secs(60 * 60
pub(crate) const WALLET_SYNC_INTERVAL_MINIMUM_SECS: u64 = 10;

// The timeout after which we abort a wallet syncing operation.
pub(crate) const BDK_WALLET_SYNC_TIMEOUT_SECS: u64 = 90; //40; //20; // Alby: larger timeouts are needed after multiple FC
pub(crate) const BDK_WALLET_SYNC_TIMEOUT_SECS: u64 = 90; // 40; //20; // Alby: larger timeouts are needed after multiple FC

// The timeout after which we abort a wallet syncing operation.
pub(crate) const LDK_WALLET_SYNC_TIMEOUT_SECS: u64 = 90; //40; //10; // Alby: larger timeouts are needed after multiple FC
pub(crate) const LDK_WALLET_SYNC_TIMEOUT_SECS: u64 = 90; // 40; //10; // Alby: larger timeouts are needed after multiple FC

// The timeout after which we give up waiting on LDK's event handler to exit on shutdown.
pub(crate) const LDK_EVENT_HANDLER_SHUTDOWN_TIMEOUT_SECS: u64 = 60; // 30;

// The timeout after which we give up waiting on a background task to exit on shutdown.
pub(crate) const BACKGROUND_TASK_SHUTDOWN_TIMEOUT_SECS: u64 = 20; //5;
pub(crate) const BACKGROUND_TASK_SHUTDOWN_TIMEOUT_SECS: u64 = 20; // 5;

// The timeout after which we abort a fee rate cache update operation.
pub(crate) const FEE_RATE_CACHE_UPDATE_TIMEOUT_SECS: u64 = 10; //5;
pub(crate) const FEE_RATE_CACHE_UPDATE_TIMEOUT_SECS: u64 = 10; // 5;

// The timeout after which we abort a transaction broadcast operation.
pub(crate) const TX_BROADCAST_TIMEOUT_SECS: u64 = 10; //5;
pub(crate) const TX_BROADCAST_TIMEOUT_SECS: u64 = 10; // 5;

// The timeout after which we abort a RGS sync operation.
pub(crate) const RGS_SYNC_TIMEOUT_SECS: u64 = 5;
Expand Down
2 changes: 1 addition & 1 deletion src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ where
preimage: Some(Some(payment_preimage)),
fee_paid_msat: Some(fee_paid_msat),
status: Some(PaymentStatus::Succeeded),
//fee_msat: Some(fee_paid_msat),
// fee_msat: Some(fee_paid_msat),
..PaymentDetailsUpdate::new(payment_id)
};

Expand Down
1 change: 0 additions & 1 deletion src/io/sqlite_store/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use std::sync::atomic::{AtomicU64, Ordering};
use std::sync::{Arc, Mutex};

use lightning::io;

use lightning::util::persist::{
KVStore, KVStoreSync, NETWORK_GRAPH_PERSISTENCE_KEY,
NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
Expand Down
2 changes: 0 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ use payment::{
UnifiedQrPayment,
};
use peer_store::{PeerInfo, PeerStore};

use rand::Rng;
use runtime::Runtime;
use types::{
Expand All @@ -170,7 +169,6 @@ pub use {
};

use crate::scoring::setup_background_pathfinding_scores_sync;

use crate::types::KeyValue;
pub use crate::types::{MigrateStorage, ResetState, TlvEntry};

Expand Down
5 changes: 2 additions & 3 deletions src/payment/store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
// http://opensource.org/licenses/MIT>, at your option. You may not use this file except in
// accordance with one or both of these licenses.

use crate::types::TlvEntry;

use std::time::{Duration, SystemTime, UNIX_EPOCH};

use bitcoin::{BlockHash, Txid};
Expand All @@ -23,6 +21,7 @@ use lightning_types::string::UntrustedString;

use crate::data_store::{StorableObject, StorableObjectId, StorableObjectUpdate};
use crate::hex_utils;
use crate::types::TlvEntry;

/// Represents a payment.
#[derive(Clone, Debug, PartialEq, Eq)]
Expand Down Expand Up @@ -570,7 +569,7 @@ pub(crate) struct PaymentDetailsUpdate {
pub counterparty_skimmed_fee_msat: Option<Option<u64>>,
pub direction: Option<PaymentDirection>,
pub status: Option<PaymentStatus>,
//pub fee_msat: Option<Option<u64>>, // old Alby field
// pub fee_msat: Option<Option<u64>>, // old Alby field
pub confirmation_status: Option<ConfirmationStatus>,
}

Expand Down
2 changes: 1 addition & 1 deletion tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ macro_rules! expect_channel_ready_event {
pub(crate) use expect_channel_ready_event;

macro_rules! expect_splice_pending_event {
($node: expr, $counterparty_node_id: expr) => {{
($node:expr, $counterparty_node_id:expr) => {{
match $node.next_event_async().await {
ref e @ Event::SplicePending { new_funding_txo, counterparty_node_id, .. } => {
println!("{} got event {:?}", $node.node_id(), e);
Expand Down