Resolve various warnings

core/src/core/id.rs:
- We have documentation annotated macros that do Rust does not generate docs for

chain/src/store.rs:
- Resolves unused assignment warnings
  - These are resolved by removing no-operation conditions within 'else' branches.
  - Instead, we initialize 'prev_header' with 'None', and only populate on successful bool = true

src/bin/tui/mining.rs:
- Comment out variants in Mining tables that are never constructed
- Looks like they were removed due to size constraints of TUI, Rust doesn't like the variants being present when not used

Author: who-biz

chain/src/store.rs

@@ -520,8 +520,6 @@ impl<'a> Iterator for DifficultyIter<'a> {
 					} else {
 						if let Some(ref store) = self.store {
 							prev_header = store.get_previous_header(&head).ok();
-						} else {
-							prev_header = None;
 						}
 					}
 
@@ -763,8 +761,6 @@ impl<'a> Iterator for BottleIter<'a> {
 					} else {
 						if let Some(ref store) = self.store {
 							prev_header = store.get_previous_header(&head).ok();
-						} else {
-							prev_header = None;
 						}
 					}
 

core/src/core/id.rs

@@ -74,9 +74,9 @@ impl<H: Hashed> ShortIdentifiable for H {
 pub struct ShortId([u8; 6]);
 
 impl DefaultHashable for ShortId {}
-/// We want to sort short_ids in a canonical and consistent manner so we can
-/// verify sort order in the same way we do for full inputs|outputs|kernels
-/// themselves.
+// We want to sort short_ids in a canonical and consistent manner so we can
+// verify sort order in the same way we do for full inputs|outputs|kernels
+// themselves.
 hashable_ord!(ShortId);
 
 impl ::std::fmt::Debug for ShortId {

src/bin/tui/mining.rs

@@ -41,7 +41,7 @@ enum StratumWorkerColumn {
 	Id,
 	IsConnected,
 	LastSeen,
-	PowDifficulty,
+	//	PowDifficulty,
 	NumAccepted,
 	NumRejected,
 	NumStale,
@@ -54,7 +54,7 @@ impl StratumWorkerColumn {
 			StratumWorkerColumn::Id => "Worker ID",
 			StratumWorkerColumn::IsConnected => "Connected",
 			StratumWorkerColumn::LastSeen => "Last Seen",
-			StratumWorkerColumn::PowDifficulty => "PowDifficulty",
+			//			StratumWorkerColumn::PowDifficulty => "PowDifficulty",
 			StratumWorkerColumn::NumAccepted => "Num Accepted",
 			StratumWorkerColumn::NumRejected => "Num Rejected",
 			StratumWorkerColumn::NumStale => "Num Stale",
@@ -79,7 +79,7 @@ impl TableViewItem<StratumWorkerColumn> for WorkerStats {
 			StratumWorkerColumn::Id => self.id.clone(),
 			StratumWorkerColumn::IsConnected => self.is_connected.to_string(),
 			StratumWorkerColumn::LastSeen => datetime.to_string(),
-			StratumWorkerColumn::PowDifficulty => self.pow_difficulty.to_string(),
+			//			StratumWorkerColumn::PowDifficulty => self.pow_difficulty.to_string(),
 			StratumWorkerColumn::NumAccepted => self.num_accepted.to_string(),
 			StratumWorkerColumn::NumRejected => self.num_rejected.to_string(),
 			StratumWorkerColumn::NumStale => self.num_stale.to_string(),
@@ -95,7 +95,7 @@ impl TableViewItem<StratumWorkerColumn> for WorkerStats {
 			StratumWorkerColumn::Id => Ordering::Equal,
 			StratumWorkerColumn::IsConnected => Ordering::Equal,
 			StratumWorkerColumn::LastSeen => Ordering::Equal,
-			StratumWorkerColumn::PowDifficulty => Ordering::Equal,
+			//			StratumWorkerColumn::PowDifficulty => Ordering::Equal,
 			StratumWorkerColumn::NumAccepted => Ordering::Equal,
 			StratumWorkerColumn::NumRejected => Ordering::Equal,
 			StratumWorkerColumn::NumStale => Ordering::Equal,
@@ -109,7 +109,7 @@ enum DiffColumn {
 	Hash,
 	PoWType,
 	Difficulty,
-	SecondaryScaling,
+	//	SecondaryScaling,
 	Time,
 	Duration,
 }
@@ -121,7 +121,7 @@ impl DiffColumn {
 			DiffColumn::Hash => "Hash",
 			DiffColumn::PoWType => "Algorithm",
 			DiffColumn::Difficulty => "Network Difficulty",
-			DiffColumn::SecondaryScaling => "Sec. Scaling",
+			//			DiffColumn::SecondaryScaling => "Sec. Scaling",
 			DiffColumn::Time => "Block Time",
 			DiffColumn::Duration => "Duration",
 		}
@@ -138,7 +138,7 @@ impl TableViewItem<DiffColumn> for DiffBlock {
 			DiffColumn::Hash => self.block_hash.to_string(),
 			DiffColumn::PoWType => pow_type,
 			DiffColumn::Difficulty => self.difficulty.to_string(),
-			DiffColumn::SecondaryScaling => self.secondary_scaling.to_string(),
+			//			DiffColumn::SecondaryScaling => self.secondary_scaling.to_string(),
 			DiffColumn::Time => format!("{}", datetime).to_string(),
 			DiffColumn::Duration => format!("{}s", self.duration).to_string(),
 		}
@@ -153,7 +153,7 @@ impl TableViewItem<DiffColumn> for DiffBlock {
 			DiffColumn::Hash => Ordering::Equal,
 			DiffColumn::PoWType => Ordering::Equal,
 			DiffColumn::Difficulty => Ordering::Equal,
-			DiffColumn::SecondaryScaling => Ordering::Equal,
+			//			DiffColumn::SecondaryScaling => Ordering::Equal,
 			DiffColumn::Time => Ordering::Equal,
 			DiffColumn::Duration => Ordering::Equal,
 		}
@@ -190,9 +190,9 @@ impl TUIStatusListener for TUIMiningView {
 			.column(StratumWorkerColumn::LastSeen, "Last Seen", |c| {
 				c.width_percent(16)
 			})
-			// .column(StratumWorkerColumn::PowDifficulty, "Pow Difficulty", |c| {
-			// 	c.width_percent(12)
-			// })
+			/*.column(StratumWorkerColumn::PowDifficulty, "Pow Difficulty", |c| {
+				 c.width_percent(12)
+			})*/
 			.column(StratumWorkerColumn::NumAccepted, "Num Accepted", |c| {
 				c.width_percent(10)
 			})
@@ -273,9 +273,9 @@ impl TUIStatusListener for TUIMiningView {
 			.column(DiffColumn::Difficulty, "Difficulty", |c| {
 				c.width_percent(20)
 			})
-			// .column(DiffColumn::SecondaryScaling, "Sec. Scaling", |c| {
-			// 	c.width_percent(10)
-			// })
+			/*.column(DiffColumn::SecondaryScaling, "Sec. Scaling", |c| {
+				 c.width_percent(10)
+			})*/
 			.column(DiffColumn::Time, "Block Time", |c| c.width_percent(25))
 			.column(DiffColumn::Duration, "Duration", |c| c.width_percent(25));