solve conflict

EspressoSystems · Oct 11, 2023 · 20187f2 · 20187f2
1 parent d2a6c6a
commit 20187f2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/hotshot/src/traits/networking/memory_network.rs b/crates/hotshot/src/traits/networking/memory_network.rs
@@ -92,7 +92,7 @@ struct MemoryNetworkInner<M: NetworkMsg, K: SignatureKey> {
 
     /// The networking metrics we're keeping track of
     metrics: NetworkingMetricsValue,
-  
+
     /// config to introduce unreliability to the network
     reliability_config: Option<Arc<RwLock<dyn 'static + NetworkReliability>>>,
 }
@@ -330,7 +330,7 @@ impl<M: NetworkMsg, K: SignatureKey + 'static> ConnectedNetwork<M, K> 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<M: NetworkMsg, K: SignatureKey + 'static> ConnectedNetwork<M, K> 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
@@ -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
@@ -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),
         }
     }
 }