re-add set_len() calls commented out; restore one that shouldn't caus…

…e panics
ZcashFoundation · Jun 13, 2023 · 74365c4 · 74365c4
1 parent 4965b2c
commit 74365c4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/zebra-consensus/src/checkpoint.rs b/zebra-consensus/src/checkpoint.rs
@@ -311,7 +311,9 @@ where
         if matches!(howudoin::cancelled(), Some(true)) {
             self.finish_diagnostics();
         } else {
-            self.queued_blocks_bar.set_pos(max_queued_height.0);
+            self.queued_blocks_bar
+                .set_pos(max_queued_height.0)
+                .set_len(u64::from(self.checkpoint_list.max_height().0));
         }
     }
 

diff --git a/zebra-network/src/address_book_updater.rs b/zebra-network/src/address_book_updater.rs
@@ -99,13 +99,16 @@ impl AddressBookUpdater {
 
                     address_bar
                         .set_pos(u64::try_from(address_info.num_addresses).expect("fits in u64"));
+                    // .set_len(u64::try_from(address_info.address_limit).expect("fits in u64"));
 
                     let never_attempted = address_info.never_attempted_alternate
                         + address_info.never_attempted_gossiped;
 
                     never_bar.set_pos(u64::try_from(never_attempted).expect("fits in u64"));
+                    // .set_len(u64::try_from(address_info.address_limit).expect("fits in u64"));
 
                     failed_bar.set_pos(u64::try_from(address_info.failed).expect("fits in u64"));
+                    // .set_len(u64::try_from(address_info.address_limit).expect("fits in u64"));
                 }
             }
 

diff --git a/zebra-network/src/peer_set/limit.rs b/zebra-network/src/peer_set/limit.rs
@@ -116,6 +116,7 @@ impl ActiveConnectionCounter {
         #[cfg(feature = "progress-bar")]
         self.connection_bar
             .set_pos(u64::try_from(self.count).expect("fits in u64"));
+        // .set_len(u64::try_from(self.limit).expect("fits in u64"));
 
         self.count
     }

diff --git a/zebra-state/src/service/non_finalized_state.rs b/zebra-state/src/service/non_finalized_state.rs
@@ -663,6 +663,7 @@ impl NonFinalizedState {
                 .map(|chain| chain.non_finalized_root_height().0 - 1);
 
             chain_count_bar.set_pos(u64::try_from(self.chain_count()).expect("fits in u64"));
+            // .set_len(u64::try_from(MAX_NON_FINALIZED_CHAIN_FORKS).expect("fits in u64"));
 
             if let Some(finalized_tip_height) = finalized_tip_height {
                 chain_count_bar.desc(format!("Finalized Root {finalized_tip_height}"));
@@ -700,6 +701,9 @@ impl NonFinalizedState {
                 chain_length_bar
                     .label(format!("Fork {fork_height}"))
                     .set_pos(u64::try_from(chain.len()).expect("fits in u64"));
+                // .set_len(u64::from(
+                //     zebra_chain::transparent::MIN_TRANSPARENT_COINBASE_MATURITY,
+                // ));
 
                 // display work as bits
                 let mut desc = format!(

diff --git a/zebrad/src/components/mempool.rs b/zebrad/src/components/mempool.rs
@@ -415,17 +415,25 @@ impl Mempool {
                 / zebra_chain::transaction::MEMPOOL_TRANSACTION_COST_THRESHOLD;
 
             self.queued_count_bar = Some(*howudoin::new().label("Mempool Queue").set_pos(0u64));
+            // .set_len(
+            //     u64::try_from(downloads::MAX_INBOUND_CONCURRENCY).expect("fits in u64"),
+            // ),
 
             self.transaction_count_bar = Some(*howudoin::new().label("Mempool Txs").set_pos(0u64));
+            // .set_len(max_transaction_count),
 
             self.transaction_cost_bar = Some(
                 howudoin::new()
                     .label("Mempool Cost")
                     .set_pos(0u64)
+                    // .set_len(self.config.tx_cost_limit)
                     .fmt_as_bytes(true),
             );
 
             self.rejected_count_bar = Some(*howudoin::new().label("Mempool Rejects").set_pos(0u64));
+            // .set_len(
+            //     u64::try_from(storage::MAX_EVICTION_MEMORY_ENTRIES).expect("fits in u64"),
+            // ),
         }
 
         // Update if the mempool has ever been active