Merge pull request #1598 from carver/humanize-hash

Pretty hash display utility

Author: carver

tests/trinity/core/humanize-utils/test_humanize_elapsed.py renamed to tests/trinity/core/utils/test_humanize.py

@@ -1,6 +1,6 @@
 import pytest
 
-from trinity.utils.humanize import humanize_elapsed
+from trinity.utils.humanize import humanize_elapsed, humanize_hash
 
 
 SECOND = 1
@@ -39,3 +39,13 @@
 def test_humanize_elapsed(seconds, expected):
     actual = humanize_elapsed(seconds)
     assert actual == expected
+
+
+@pytest.mark.parametrize(
+    'hash32,expected',
+    (
+        (bytes(range(32)), '0001..1e1f'),
+    )
+)
+def test_humanize_hash(hash32, expected):
+    assert humanize_hash(hash32) == expected

trinity/sync/full/chain.py

@@ -65,7 +65,7 @@
     TaskQueue,
 )
 from trinity.utils.ema import EMA
-from trinity.utils.humanize import humanize_elapsed
+from trinity.utils.humanize import humanize_elapsed, humanize_hash
 from trinity.utils.timer import Timer
 
 # (ReceiptBundle, (Receipt, (root_hash, receipt_trie_data))
@@ -537,7 +537,7 @@ async def _display_stats(self) -> None:
                     "bps=%-3d  "
                     "tps=%-4d  "
                     "elapsed=%0.1f  "
-                    "head=#%d (%s...%s)  "
+                    "head=#%d %s  "
                     "age=%s"
                 ),
                 stats.num_blocks,
@@ -546,8 +546,7 @@ async def _display_stats(self) -> None:
                 stats.transactions_per_second,
                 stats.elapsed,
                 stats.latest_head.block_number,
-                stats.latest_head.hex_hash[2:6],
-                stats.latest_head.hex_hash[-4:],
+                humanize_hash(stats.latest_head.hash),
                 humanize_elapsed(head_age),
             )
 

trinity/utils/humanize.py

@@ -1,5 +1,7 @@
 from typing import Iterator
 
+from eth_typing import Hash32
+
 
 def humanize_elapsed(seconds: int) -> str:
     return ''.join(_humanize_elapsed(seconds))
@@ -44,3 +46,12 @@ def _humanize_elapsed(seconds: int) -> Iterator[str]:
             return
 
         remainder %= duration
+
+
+DISPLAY_HASH_BYTES = 2
+
+
+def humanize_hash(value: Hash32) -> str:
+    head = value[:DISPLAY_HASH_BYTES]
+    tail = value[-1 * DISPLAY_HASH_BYTES:]
+    return f"{head.hex()}..{tail.hex()}"