Minor cleanup

Author: ImplOfAnImpl

build-tools/block-data-plots/collect_data.py

@@ -28,7 +28,7 @@ def collect_data(args):
         "--output-file", output_file,
         "--mainchain-only=true",
         "--fields=height,timestamp,target",
-        "--from_height=0"
+        "--from-height=0"
     ]
 
     if args.node_data_dir is not None:

build-tools/fork-detection/detector.py

@@ -551,7 +551,9 @@ def main():
             default=None)
         args = parser.parse_args()
 
-        email_sender = EmailSender(args.notification_email, args.notification_email_from)
+        email_sender = EmailSender(
+            args.chain_type, args.notification_email, args.notification_email_from
+        )
 
         try:
             Handler(args, email_sender).run()

build-tools/fork-detection/utils.py

@@ -414,15 +414,16 @@ def show_cursor():
 class EmailSender:
     # to_addr - the address to send emails to; if None, nothing will be sent.
     # from_addr - the 'from' address for the emails; if None, to_addr will be used.
-    def __init__(self, to_addr: str | None, from_addr: str | None):
+    def __init__(self, chain_type: str, to_addr: str | None, from_addr: str | None):
+        self.chain_type = chain_type
         self.to_addr = to_addr
         self.from_addr = from_addr or to_addr
 
     def send(self, msg_subj, msg_body):
         if self.to_addr is not None:
             msg = MIMEText(msg_body)
             msg["Subject"] = msg_subj
-            msg["From"] = f"Fork detection script at {platform.node()} <{self.from_addr}>"
+            msg["From"] = f"Fork detection script at {platform.node()} ({self.chain_type}) <{self.from_addr}>"
             msg["To"] = self.to_addr
 
             s = smtplib.SMTP('localhost')

chainstate/db-dumper/src/dumper/options.rs

@@ -69,7 +69,7 @@ pub struct Options {
     pub mainchain_only: bool,
 
     /// Block height to start from
-    #[clap(long = "from_height", default_value_t = 0)]
+    #[clap(long = "from-height", default_value_t = 0)]
     pub from_height: u64,
 
     /// This help string

chainstate/src/detail/error.rs

@@ -168,7 +168,7 @@ pub enum CheckBlockError {
     #[error("CRITICAL: Failed to retrieve ancestor of submitted block: {0}")]
     GetAncestorError(#[from] GetAncestorError),
     #[error(
-        "Attempted to add a block before reorg limit (attempted at height: {} while current height is: {} and min allowed is: {})",
+        "Attempted to add a block before reorg limit (common ancestor height is: {} while current tip height is: {} and min allowed is: {})",
         common_ancestor_height,
         tip_block_height,
         min_allowed_height