diff --git a/Cargo.lock b/Cargo.lock index 355e077b79..7d6eecec8f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2634,7 +2634,7 @@ dependencies = [ "custom_debug", "dashmap", "derivative", - "dyn-clone 1.0.14", + "dyn-clone 1.0.14 (git+https://github.com/dtolnay/dyn-clone?tag=1.0.14)", "either", "embed-doc-image", "espresso-systems-common 0.4.1", @@ -2862,7 +2862,7 @@ dependencies = [ "derivative", "digest 0.10.7", "displaydoc", - "dyn-clone 1.0.14", + "dyn-clone 1.0.14 (git+https://github.com/dtolnay/dyn-clone?tag=1.0.14)", "either", "espresso-systems-common 0.4.1", "ethereum-types", @@ -3376,7 +3376,7 @@ dependencies = [ "derivative", "displaydoc", "downcast-rs", - "dyn-clone 1.0.13", + "dyn-clone 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.13.2", "itertools 0.10.5", "jf-utils", diff --git a/crates/hotshot/src/traits/networking/memory_network.rs b/crates/hotshot/src/traits/networking/memory_network.rs index 7fd22aa274..c67d90147e 100644 --- a/crates/hotshot/src/traits/networking/memory_network.rs +++ b/crates/hotshot/src/traits/networking/memory_network.rs @@ -92,7 +92,7 @@ struct MemoryNetworkInner { /// The networking metrics we're keeping track of metrics: NetworkingMetricsValue, - + /// config to introduce unreliability to the network reliability_config: Option>>, } @@ -330,7 +330,7 @@ impl ConnectedNetwork for Memory let res = node.broadcast_input(vec.clone()).await; match res { Ok(_) => { - self.inner.metrics.outgoing_message_count.add(1); + self.inner.metrics.outgoing_broadcast_message_count.add(1); trace!(?key, "Delivered message to remote"); } Err(e) => { @@ -374,7 +374,7 @@ impl ConnectedNetwork for Memory let res = node.direct_input(vec).await; match res { Ok(_) => { - self.inner.metrics.outgoing_message_count.add(1); + self.inner.metrics.outgoing_direct_message_count.add(1); trace!(?recipient, "Delivered message to remote"); Ok(()) } diff --git a/crates/task-impls/src/consensus.rs b/crates/task-impls/src/consensus.rs index 5f4455ddc4..cac7d4d1f2 100644 --- a/crates/task-impls/src/consensus.rs +++ b/crates/task-impls/src/consensus.rs @@ -816,12 +816,10 @@ where // starting from the first iteration with a three chain, e.g. right after the else if case nested in the if case above if new_decide_reached { let mut leaf = leaf.clone(); - consensus - .metrics - .last_synced_block_height - .set(usize::try_from(leaf.height).unwrap_or(0)); - + .metrics + .last_synced_block_height + .set(usize::try_from(leaf.height).unwrap_or(0)); // If the full block is available for this leaf, include it in the leaf // chain that we send to the client. if let Some(block) = diff --git a/crates/types/src/consensus.rs b/crates/types/src/consensus.rs index 896c49ae93..6574a73f8a 100644 --- a/crates/types/src/consensus.rs +++ b/crates/types/src/consensus.rs @@ -224,8 +224,7 @@ impl ConsensusMetricsValue { .create_gauge(String::from("outstanding_transactions"), None), outstanding_transactions_memory_size: metrics .create_gauge(String::from("outstanding_transactions_memory_size"), None), - number_of_timeouts: metrics - .create_counter(String::from("number_of_timeouts"), None), + number_of_timeouts: metrics.create_counter(String::from("number_of_timeouts"), None), } } }