github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

wallet: fix SceneGraph::rename_node() function which wasn't renaming parents and children info fields

Browse Source
This commit is contained in:
rsx
2024-05-05 17:08:36 +02:00
parent e71f8f5a82
commit 6d7bbd3ed7
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/darkwallet/src/net.rs
View File

@@ -219,7 +219,7 @@ impl ZeroMQAdapter {
Command::RenameNode => {
let node_id = SceneNodeId::decode(&mut cur).unwrap();
let node_name = String::decode(&mut cur).unwrap();
debug!(target: "req", "{:?}({})", cmd, node_id);
debug!(target: "req", "{:?}({}, {})", cmd, node_id, node_name);
scene_graph.rename_node(node_id, node_name)?;
}
Command::ScanDangling => {

29
bin/darkwallet/src/scene.rs
View File

@@ -250,7 +250,34 @@ impl SceneGraph {
}
}
let node = self.get_node_mut(node_id).unwrap();
node.name = node_name;
node.name = node_name.clone();
// Now update it for all children and parents too
let parent_ids: Vec<_> = node.parents.iter().map(|parent_inf| parent_inf.id).collect();
let child_ids: Vec<_> = node.children.iter().map(|child_inf| child_inf.id).collect();
drop(node);
'next_parent: for parent_id in parent_ids {
let parent = self.get_node_mut(parent_id).unwrap();
for child in &mut parent.children {
if child.id == node_id {
child.name = node_name.clone();
continue 'next_parent
}
}
panic!("child {} not found in parent {}!", node_id, parent.id)
}
'next_child: for child_id in child_ids {
let child = self.get_node_mut(child_id).unwrap();
for parent in &mut child.parents {
if parent.id == node_id {
parent.name = node_name.clone();
continue 'next_child
}
}
panic!("parent {} not found in child {}!", node_id, child.id)
}
Ok(())
}
fn node_siblings(&self, node_id: SceneNodeId) -> Result<Vec<SceneNodeInfo>> {