chore: remove commented out code

Author: rolznz

src/builder.rs

@@ -1564,80 +1564,6 @@ fn build_with_store_internal(
 		Arc::clone(&logger),
 	));
 
-	/*let chain_source = match chain_data_source_config {
-		Some(ChainDataSourceConfig::Esplora { server_url, sync_config }) => {
-			log_info!(logger, "Using esplora server: {}", server_url);
-			let sync_config = sync_config.unwrap_or(EsploraSyncConfig::default());
-			Arc::new(ChainSource::new_esplora(
-				server_url.clone(),
-				sync_config,
-				Arc::clone(&wallet),
-				Arc::clone(&fee_estimator),
-				Arc::clone(&tx_broadcaster),
-				Arc::clone(&kv_store),
-				Arc::clone(&config),
-				Arc::clone(&logger),
-				Arc::clone(&node_metrics),
-			))
-		},
-		Some(ChainDataSourceConfig::Electrum { server_url, sync_config }) => {
-			let sync_config = sync_config.unwrap_or(ElectrumSyncConfig::default());
-			Arc::new(ChainSource::new_electrum(
-				server_url.clone(),
-				sync_config,
-				Arc::clone(&wallet),
-				Arc::clone(&fee_estimator),
-				Arc::clone(&tx_broadcaster),
-				Arc::clone(&kv_store),
-				Arc::clone(&config),
-				Arc::clone(&logger),
-				Arc::clone(&node_metrics),
-			))
-		},
-		Some(ChainDataSourceConfig::BitcoindRpc { rpc_host, rpc_port, rpc_user, rpc_password }) => {
-			Arc::new(ChainSource::new_bitcoind_rpc(
-				rpc_host.clone(),
-				*rpc_port,
-				rpc_user.clone(),
-				rpc_password.clone(),
-				Arc::clone(&wallet),
-				Arc::clone(&fee_estimator),
-				Arc::clone(&tx_broadcaster),
-				Arc::clone(&kv_store),
-				Arc::clone(&config),
-				Arc::clone(&logger),
-				Arc::clone(&node_metrics),
-			))
-		},
-		None => {
-			// Default to Esplora client.
-			let server_url = DEFAULT_ESPLORA_SERVER_URL.to_string();
-			let sync_config = EsploraSyncConfig::default();
-			Arc::new(ChainSource::new_esplora(
-				server_url.clone(),
-				sync_config,
-				Arc::clone(&wallet),
-				Arc::clone(&fee_estimator),
-				Arc::clone(&tx_broadcaster),
-				Arc::clone(&kv_store),
-				Arc::clone(&config),
-				Arc::clone(&logger),
-				Arc::clone(&node_metrics),
-			))
-		},
-	};
-
-	let runtime = Arc::new(RwLock::new(None));
-
-	// Initialize the ChainMonitor
-	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
-		Some(Arc::clone(&chain_source)),
-		Arc::clone(&tx_broadcaster),
-		Arc::clone(&logger),
-		Arc::clone(&fee_estimator),
-		Arc::clone(&kv_store),
-	));*/
-
 	// Initialize the KeysManager
 	let cur_time = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).map_err(|e| {
 		log_error!(logger, "Failed to get current time: {}", e);

src/chain/mod.rs

@@ -8,42 +8,6 @@
 mod bitcoind;
 mod electrum;
 
-/*use crate::chain::bitcoind_rpc::{
-	BitcoindRpcClient, BoundedHeaderCache, ChainListener, FeeRateEstimationMode,
-};
-use crate::chain::electrum::ElectrumRuntimeClient;
-use crate::config::{
-	BackgroundSyncConfig, Config, ElectrumSyncConfig, EsploraSyncConfig, BDK_CLIENT_CONCURRENCY,
-	BDK_CLIENT_STOP_GAP, BDK_WALLET_SYNC_TIMEOUT_SECS, FEE_RATE_CACHE_UPDATE_TIMEOUT_SECS,
-	LDK_WALLET_SYNC_TIMEOUT_SECS, RESOLVED_CHANNEL_MONITOR_ARCHIVAL_INTERVAL,
-	TX_BROADCAST_TIMEOUT_SECS, WALLET_SYNC_INTERVAL_MINIMUM_SECS,
-};
-use crate::fee_estimator::{
-	apply_post_estimation_adjustments, get_all_conf_targets, get_num_block_defaults_for_target,
-	ConfirmationTarget, OnchainFeeEstimator,
-};
-use crate::io::utils::write_node_metrics;
-use crate::logger::{log_bytes, log_debug, log_error, log_info, log_trace, LdkLogger, Logger};
-use crate::types::{Broadcaster, ChainMonitor, ChannelManager, DynStore, Sweeper, Wallet};
-use crate::{Error, NodeMetrics};
-
-use lightning::chain::chaininterface::ConfirmationTarget as LdkConfirmationTarget;
-use lightning::chain::{Confirm, Filter, Listen, WatchedOutput};
-use lightning::util::ser::Writeable;
-
-use lightning_transaction_sync::EsploraSyncClient;
-
-use lightning_block_sync::gossip::UtxoSource;
-use lightning_block_sync::init::{synchronize_listeners, validate_best_block_header};
-use lightning_block_sync::poll::{ChainPoller, ChainTip, ValidatedBlockHeader};
-use lightning_block_sync::SpvClient;
-
-use bdk_esplora::EsploraAsyncExt;
-use bdk_wallet::Update as BdkUpdate;
-
-use esplora_client::AsyncClient as EsploraAsyncClient;
-
-use bitcoin::{FeeRate, Network, Script, ScriptBuf, Txid};*/
 mod esplora;
 
 use std::collections::HashMap;

src/event.rs

@@ -40,35 +40,6 @@ use crate::io::{
 	EVENT_QUEUE_PERSISTENCE_KEY, EVENT_QUEUE_PERSISTENCE_PRIMARY_NAMESPACE,
 	EVENT_QUEUE_PERSISTENCE_SECONDARY_NAMESPACE,
 };
-/*use crate::logger::{log_debug, log_error, log_info, LdkLogger};
-
-use lightning::events::bump_transaction::BumpTransactionEvent;
-use lightning::events::{ClosureReason, PaymentPurpose, ReplayEvent};
-use lightning::events::{Event as LdkEvent, PaymentFailureReason};
-use lightning::impl_writeable_tlv_based_enum;
-use lightning::ln::channelmanager::PaymentId;
-use lightning::ln::types::ChannelId;
-use lightning::routing::gossip::NodeId;
-use lightning::util::errors::APIError;
-use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
-
-use lightning_types::payment::{PaymentHash, PaymentPreimage};
-
-use lightning_liquidity::lsps2::utils::compute_opening_fee;
-
-use bitcoin::blockdata::locktime::absolute::LockTime;
-use bitcoin::secp256k1::PublicKey;
-use bitcoin::{Amount, OutPoint};
-
-use rand::{thread_rng, Rng};
-
-use core::future::Future;
-use core::task::{Poll, Waker};
-use std::collections::VecDeque;
-use std::ops::Deref;
-use std::str::FromStr;
-use std::sync::{Arc, Condvar, Mutex, RwLock};
-use std::time::Duration;*/
 use crate::liquidity::LiquiditySource;
 use crate::logger::{log_debug, log_error, log_info, log_trace, LdkLogger, Logger};
 use crate::payment::asynchronous::om_mailbox::OnionMessageMailbox;

src/lib.rs

@@ -118,16 +118,8 @@ pub use builder::BuildError;
 pub use builder::NodeBuilder as Builder;
 use chain::ChainSource;
 use config::{
-	//default_user_config, may_announce_channel, ChannelConfig, Config,
-	//BACKGROUND_TASK_SHUTDOWN_TIMEOUT_SECS, LDK_EVENT_HANDLER_SHUTDOWN_TIMEOUT_SECS,
-	default_user_config,
-	may_announce_channel,
-	AsyncPaymentsRole,
-	ChannelConfig,
-	Config,
-	NODE_ANN_BCAST_INTERVAL,
-	PEER_RECONNECTION_INTERVAL,
-	RGS_SYNC_INTERVAL,
+	default_user_config, may_announce_channel, AsyncPaymentsRole, ChannelConfig, Config,
+	NODE_ANN_BCAST_INTERVAL, PEER_RECONNECTION_INTERVAL, RGS_SYNC_INTERVAL,
 };
 use connection::ConnectionManager;
 pub use error::Error as NodeError;

src/payment/store.rs

@@ -48,12 +48,6 @@ pub struct PaymentDetails {
 	pub status: PaymentStatus,
 	/// The timestamp, in seconds since start of the UNIX epoch, when this entry was last updated.
 	pub latest_update_timestamp: u64,
-
-	// Old Alby fields - duplicates of new LDK fields
-	/*/// Alby: Last update timestamp, as seconds since Unix epoch. TODO: remove and use latest_update_timestamp
-	pub last_update: u64,
-	/// Alby: Fee paid. TODO: remove and use fee_paid_msat
-	pub fee_msat: Option<u64>,*/
 	/// Alby: Payment creation timestamp, as seconds since Unix epoch.
 	pub created_at: u64,
 }

src/types.rs

@@ -383,14 +383,6 @@ pub struct ChannelDetails {
 
 impl From<LdkChannelDetails> for ChannelDetails {
 	fn from(value: LdkChannelDetails) -> Self {
-		// let channel_type = value.channel_type.map(|t| {
-		// 	if t.requires_anchors_zero_fee_htlc_tx() {
-		// 		ChannelType::Anchors
-		// 	} else {
-		// 		ChannelType::StaticRemoteKey
-		// 	}
-		// });
-
 		ChannelDetails {
 			channel_id: value.channel_id,
 			counterparty_node_id: value.counterparty.node_id,