GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TUI Mining Screen (block hash and block height) (#2142)

Browse Source 
* add block hash to tui mining diff screen
include current header in there also

* rework the mining screen on the tui
show block hash as well as block height
fix the "off by one" error
This commit is contained in:
Antioch Peverell
2018-12-12 19:41:42 +00:00
committed by Ignotus Peverell
parent 305b36dcce
commit 675edb4a19
3 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/tui/mining.rs
+10 -7
View File
@@ -99,7 +99,8 @@ impl TableViewItem<StratumWorkerColumn> for WorkerStats {
}
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
enum DiffColumn {
BlockNumber,
Height,
Hash,
PoWType,
Difficulty,
SecondaryScaling,
@@ -110,7 +111,8 @@ enum DiffColumn {
impl DiffColumn {
fn _as_str(&self) -> &str {
match *self {
DiffColumn::BlockNumber => "Block Number",
DiffColumn::Height => "Height",
DiffColumn::Hash => "Hash",
DiffColumn::PoWType => "Type",
DiffColumn::Difficulty => "Network Difficulty",
DiffColumn::SecondaryScaling => "Sec. Scaling",
@@ -130,7 +132,8 @@ impl TableViewItem<DiffColumn> for DiffBlock {
};
match column {
DiffColumn::BlockNumber => self.block_number.to_string(),
DiffColumn::Height => self.block_height.to_string(),
DiffColumn::Hash => self.block_hash.to_string(),
DiffColumn::PoWType => pow_type,
DiffColumn::Difficulty => self.difficulty.to_string(),
DiffColumn::SecondaryScaling => self.secondary_scaling.to_string(),
@@ -144,7 +147,8 @@ impl TableViewItem<DiffColumn> for DiffBlock {
Self: Sized,
{
match column {
DiffColumn::BlockNumber => Ordering::Equal,
DiffColumn::Height => Ordering::Equal,
DiffColumn::Hash => Ordering::Equal,
DiffColumn::PoWType => Ordering::Equal,
DiffColumn::Difficulty => Ordering::Equal,
DiffColumn::SecondaryScaling => Ordering::Equal,
@@ -264,9 +268,8 @@ impl TUIStatusListener for TUIMiningView {
);
let diff_table_view = TableView::<DiffBlock, DiffColumn>::new()
.column(DiffColumn::BlockNumber, "Block Number", |c| {
c.width_percent(15)
})
.column(DiffColumn::Height, "Height", |c| c.width_percent(10))
.column(DiffColumn::Hash, "Hash", |c| c.width_percent(10))
.column(DiffColumn::PoWType, "Type", |c| c.width_percent(10))
.column(DiffColumn::Difficulty, "Network Difficulty", |c| {
c.width_percent(15)