eric/geth
Watch
1
0
Fork
You've already forked geth
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: restore clippy quality gate

Browse source
This commit is contained in:
Eric Wendland 2026-07-05 17:24:03 +02:00
commit cad4bc0e74
4 changed files with 71 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

61
crates/geth-node/src/lib.rs
View file

@ -1657,13 +1657,13 @@ async fn cas_root_sync_from_peer(
let stored_name = remote_file_root_name(&node_id, &remote_root.name);
let stored_path = format!("remote:{node_id}:{}", remote_root.name);
let existing_remote_root = store.get_file_root_by_name(&stored_name)?;
if let Some(existing) = &existing_remote_root {
if existing.path != stored_path {
return Err(NodeError::IrohPeer(format!(
"refusing to overwrite existing file root {} at {}",
existing.name, existing.path
)));
}
if let Some(existing) = &existing_remote_root
&& existing.path != stored_path
{
return Err(NodeError::IrohPeer(format!(
"refusing to overwrite existing file root {} at {}",
existing.name, existing.path
)));
}
let base_tree = existing_remote_root
.as_ref()
@ -1695,20 +1695,19 @@ async fn cas_root_sync_from_peer(
remote_tree_json = Some(serde_json::to_string(&remote_tree)?);
if let (Some(base_tree), Some(local_root)) =
(&base_tree, store.get_file_root_by_name(&remote_root.name)?)
&& local_root.latest_tree_json.is_some()
{
if local_root.latest_tree_json.is_some() {
sync_conflicts.extend(record_sync_tree_conflicts(
&store,
&local_root,
existing_remote_root
.as_ref()
.and_then(|existing| existing.latest_tree_hash.as_deref()),
base_tree,
local_root.latest_tree_hash.as_deref(),
remote_root.latest_tree.as_ref(),
&remote_tree,
)?);
}
sync_conflicts.extend(record_sync_tree_conflicts(
&store,
&local_root,
existing_remote_root
.as_ref()
.and_then(|existing| existing.latest_tree_hash.as_deref()),
base_tree,
local_root.latest_tree_hash.as_deref(),
remote_root.latest_tree.as_ref(),
&remote_tree,
)?);
}
}
let stored = StoredFileRoot {
@ -3735,10 +3734,10 @@ async fn db_sync_from_peer(
} else {
0
};
if schema_match {
if let Some(next_cursor) = high_water_db_version.or(max_db_version) {
store_live_sync_cursor(&store, peer_node, &stream, next_cursor)?;
}
if schema_match
&& let Some(next_cursor) = high_water_db_version.or(max_db_version)
{
store_live_sync_cursor(&store, peer_node, &stream, next_cursor)?;
}
(
changes_received,
@ -4056,13 +4055,13 @@ fn sync_watermarks_for_peer(
}
}
for db in store.list_db_resources()? {
if can_sync_resource(store, &peer, &db.resource_id, "db.sync")? {
if let Ok(metadata) = geth_db::crsqlite_change_metadata(Path::new(&db.path)) {
watermarks.push(SyncWatermark {
stream: format!("db:{}", db.name),
high_water: metadata.max_db_version.unwrap_or(0),
});
}
if can_sync_resource(store, &peer, &db.resource_id, "db.sync")?
&& let Ok(metadata) = geth_db::crsqlite_change_metadata(Path::new(&db.path))
{
watermarks.push(SyncWatermark {
stream: format!("db:{}", db.name),
high_water: metadata.max_db_version.unwrap_or(0),
});
}
}
for root in store.list_file_roots()? {