Skip to content

Commit 6a5b69e

Browse files
randomloginclaude
andcommitted
fix(cbf): update write_node_metrics to update_and_persist_node_metrics after upstream API change
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 71fcb43 commit 6a5b69e

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

src/builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ use crate::chain::{ChainSource, FeeSourceConfig};
5050
use crate::config::{
5151
default_user_config, may_announce_channel, AnnounceError, AsyncPaymentsRole,
5252
BitcoindRestClientConfig, CbfSyncConfig, Config, ElectrumSyncConfig, EsploraSyncConfig,
53-
HRNResolverConfig,
54-
TorConfig, DEFAULT_ESPLORA_SERVER_URL, DEFAULT_LOG_FILENAME, DEFAULT_LOG_LEVEL,
53+
HRNResolverConfig, TorConfig, DEFAULT_ESPLORA_SERVER_URL, DEFAULT_LOG_FILENAME,
54+
DEFAULT_LOG_LEVEL,
5555
};
5656
use crate::connection::ConnectionManager;
5757
use crate::entropy::NodeEntropy;

src/chain/cbf.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use crate::fee_estimator::{
3333
apply_post_estimation_adjustments, get_all_conf_targets, get_num_block_defaults_for_target,
3434
OnchainFeeEstimator,
3535
};
36-
use crate::io::utils::write_node_metrics;
36+
use crate::io::utils::update_and_persist_node_metrics;
3737
use crate::logger::{log_bytes, log_debug, log_error, log_info, log_trace, LdkLogger, Logger};
3838
use crate::runtime::Runtime;
3939
use crate::types::{ChainMonitor, ChannelManager, DynStore, Sweeper, Wallet};
@@ -1186,10 +1186,9 @@ fn update_node_metrics_timestamp(
11861186
setter: impl FnOnce(&mut NodeMetrics, Option<u64>),
11871187
) -> Result<(), Error> {
11881188
let unix_time_secs_opt = SystemTime::now().duration_since(UNIX_EPOCH).ok().map(|d| d.as_secs());
1189-
let mut locked = node_metrics.write().unwrap();
1190-
setter(&mut locked, unix_time_secs_opt);
1191-
write_node_metrics(&*locked, kv_store, logger)?;
1192-
Ok(())
1189+
update_and_persist_node_metrics(node_metrics, kv_store, logger, |m| {
1190+
setter(m, unix_time_secs_opt);
1191+
})
11931192
}
11941193

11951194
/// Fetch a block by hash and call `transactions_confirmed` on each confirmable.

0 commit comments

Comments
 (0)