nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #1442: gui(installer): use fixed keys ordering

Browse Source 
86cebc2ddf70b1cfe2d717eb379999ee68699a5e gui(installer): use fixed keys ordering (Michael Mallan)

Pull request description:

  This is to fix #1439. It follows the same approach as used in the settings to ensure consistent ordering when iterating over keys.

ACKs for top commit:
  edouardparis:
    utACK 86cebc2ddf70b1cfe2d717eb379999ee68699a5e

Tree-SHA512: 97c95804d9656f1a24c65134f7f4269b3410252f4ebd743d57e4ef9400b68e5ab534cf304cb5c414ffb2339ea00ed64564a43eee7338dc0c0f07f87d4b421a5b
This commit is contained in:
edouardparis 2024-11-06 11:49:43 +01:00
commit ff968ea51f
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gui/src/installer/view/mod.rs
View File

@ -770,6 +770,9 @@ fn display_policy(
keys_aliases: &HashMap<Fingerprint, String>,
) -> Element<'_, Message> {
let (primary_threshold, primary_keys) = policy.primary_path().thresh_origins();
// The iteration over an HashMap keys can have a different order at each refresh
let mut primary_keys: Vec<Fingerprint> = primary_keys.into_keys().collect();
primary_keys.sort();
let recovery_paths = policy.recovery_paths();
let mut col = Column::new().push(
Row::new()
@ -789,7 +792,7 @@ fn display_policy(
})
.push(
primary_keys
.keys()
.iter()
.enumerate()
.fold(Row::new().spacing(5), |row, (i, k)| {
let content = if let Some(alias) = keys_aliases.get(k) {
@ -817,6 +820,9 @@ fn display_policy(
);
for (i, (sequence, recovery_path)) in recovery_paths.iter().enumerate() {
let (threshold, recovery_keys) = recovery_path.thresh_origins();
// The iteration over an HashMap keys can have a different order at each refresh
let mut recovery_keys: Vec<Fingerprint> = recovery_keys.into_keys().collect();
recovery_keys.sort();
col = col.push(
Row::new()
.spacing(5)
@ -833,7 +839,7 @@ fn display_policy(
} else {
text("by")
})
.push(recovery_keys.keys().enumerate().fold(
.push(recovery_keys.iter().enumerate().fold(
Row::new().spacing(5),
|row, (i, k)| {
let content = if let Some(alias) = keys_aliases.get(k) {