blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ledger-tool: fix double-readlock in main (#27322)

This commit is contained in:
Boqin Qin(秦 伯钦)@MetaSecure 2023-01-07 03:30:07 +08:00 committed by GitHub
parent 283a2b1540
commit cd5c5804ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ledger-tool/src/main.rs
View File

@ -3832,6 +3832,14 @@ fn main() {
} }
for point_detail in point_details { 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 { let record = InflationRecord {
cluster_type: format!( cluster_type: format!(
"{:?}", "{:?}",
@ -3898,20 +3906,8 @@ fn main() {
commission: format_or_na( commission: format_or_na(
detail.map(|d| d.commission), detail.map(|d| d.commission),
), ),
cluster_rewards: format_or_na( cluster_rewards: format_or_na(cluster_rewards),
last_point_value cluster_points: format_or_na(cluster_points),
.read()
.unwrap()
.clone()
.map(|pv| pv.rewards),
),
cluster_points: format_or_na(
last_point_value
.read()
.unwrap()
.clone()
.map(|pv| pv.points),
),
old_capitalization: base_bank.capitalization(), old_capitalization: base_bank.capitalization(),
new_capitalization: warped_bank.capitalization(), new_capitalization: warped_bank.capitalization(),
}; };