From cd5c5804aba2339c1a4ae9735a7b1588a24ae306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boqin=20Qin=28=E7=A7=A6=20=E4=BC=AF=E9=92=A6=29=40MetaSecu?= =?UTF-8?q?re?= Date: Sat, 7 Jan 2023 03:30:07 +0800 Subject: [PATCH] ledger-tool: fix double-readlock in main (#27322) --- ledger-tool/src/main.rs | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 1155b71e96..18955f8e15 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -3832,6 +3832,14 @@ fn main() { } for point_detail in point_details { + let (cluster_rewards, cluster_points) = + last_point_value + .read() + .unwrap() + .clone() + .map_or((None, None), |pv| { + (Some(pv.rewards), Some(pv.points)) + }); let record = InflationRecord { cluster_type: format!( "{:?}", @@ -3898,20 +3906,8 @@ fn main() { commission: format_or_na( detail.map(|d| d.commission), ), - cluster_rewards: format_or_na( - last_point_value - .read() - .unwrap() - .clone() - .map(|pv| pv.rewards), - ), - cluster_points: format_or_na( - last_point_value - .read() - .unwrap() - .clone() - .map(|pv| pv.points), - ), + cluster_rewards: format_or_na(cluster_rewards), + cluster_points: format_or_na(cluster_points), old_capitalization: base_bank.capitalization(), new_capitalization: warped_bank.capitalization(), };