From b5ebc6b43c869b130a091ece42dca6eae9379831 Mon Sep 17 00:00:00 2001 From: Heiko Schaefer Date: Tue, 17 Aug 2021 14:24:54 +0200 Subject: [PATCH] Print card name from config in test output --- card-functionality/src/cards.rs | 4 ++++ card-functionality/src/import.rs | 2 +- card-functionality/src/keygen.rs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/card-functionality/src/cards.rs b/card-functionality/src/cards.rs index 20165f8..048aee5 100644 --- a/card-functionality/src/cards.rs +++ b/card-functionality/src/cards.rs @@ -46,6 +46,10 @@ impl TestCardApp { pub fn get_config(&self) -> &Config { &self.config } + + pub fn get_name(&self) -> &str { + &self.name + } } impl TestConfig { diff --git a/card-functionality/src/import.rs b/card-functionality/src/import.rs index e0e607d..959245e 100644 --- a/card-functionality/src/import.rs +++ b/card-functionality/src/import.rs @@ -18,7 +18,7 @@ fn main() -> Result<()> { let cards = config.get_cards(); for mut card in cards { - println!("** Run tests on card {:?} **", card); + println!("** Run tests on card '{}' **", card.get_name()); println!("Reset"); let _ = run_test(&mut card, test_reset, &[])?; diff --git a/card-functionality/src/keygen.rs b/card-functionality/src/keygen.rs index 05d4bda..94b76a0 100644 --- a/card-functionality/src/keygen.rs +++ b/card-functionality/src/keygen.rs @@ -17,7 +17,7 @@ fn main() -> Result<()> { let cards = config.get_cards(); for mut card in cards { - println!("** Run tests on card {:?} **", card); + println!("** Run tests on card {} **", card.get_name()); // println!("Get pubkey"); // let _ = run_test(&mut card, test_get_pub, &[])?;