From a8d57bf2c4af228d44826096e7b9e7f29a6498d4 Mon Sep 17 00:00:00 2001 From: grdddj Date: Fri, 21 Jul 2023 11:03:11 +0200 Subject: [PATCH] chore(core/rust): add missing traces to components [no changelog] --- core/embed/rust/src/ui/component/maybe.rs | 14 ++++++++++++++ core/embed/rust/src/ui/component/text/common.rs | 10 ++++++++++ .../model_tr/component/input_methods/wordlist.rs | 5 +---- .../src/ui/model_tt/component/keyboard/bip39.rs | 10 ++++++++++ .../src/ui/model_tt/component/keyboard/mnemonic.rs | 8 +++++++- .../src/ui/model_tt/component/keyboard/slip39.rs | 10 ++++++++++ 6 files changed, 52 insertions(+), 5 deletions(-) diff --git a/core/embed/rust/src/ui/component/maybe.rs b/core/embed/rust/src/ui/component/maybe.rs index 0d7ce4f8e..cc8a1cb0e 100644 --- a/core/embed/rust/src/ui/component/maybe.rs +++ b/core/embed/rust/src/ui/component/maybe.rs @@ -144,3 +144,17 @@ pub fn paint_overlapping(components: &mut [&mut dyn PaintOverlapping]) { component.paint_overlapping() } } + +// DEBUG-ONLY SECTION BELOW + +#[cfg(feature = "ui_debug")] +impl crate::trace::Trace for Maybe +where + T: Component + crate::trace::Trace, +{ + fn trace(&self, t: &mut dyn crate::trace::Tracer) { + t.component("Maybe"); + t.child("inner", &self.inner); + t.bool("visible", self.visible); + } +} diff --git a/core/embed/rust/src/ui/component/text/common.rs b/core/embed/rust/src/ui/component/text/common.rs index 4e35cdb71..9c2212dca 100644 --- a/core/embed/rust/src/ui/component/text/common.rs +++ b/core/embed/rust/src/ui/component/text/common.rs @@ -103,3 +103,13 @@ impl TextBox { } } } + +// DEBUG-ONLY SECTION BELOW + +#[cfg(feature = "ui_debug")] +impl crate::trace::Trace for TextBox { + fn trace(&self, t: &mut dyn crate::trace::Tracer) { + t.component("TextBox"); + t.string("text", &self.text); + } +} diff --git a/core/embed/rust/src/ui/model_tr/component/input_methods/wordlist.rs b/core/embed/rust/src/ui/model_tr/component/input_methods/wordlist.rs index e79ff2433..637bf364f 100644 --- a/core/embed/rust/src/ui/model_tr/component/input_methods/wordlist.rs +++ b/core/embed/rust/src/ui/model_tr/component/input_methods/wordlist.rs @@ -232,10 +232,7 @@ where T: StringType + Clone, { fn trace(&self, t: &mut dyn crate::trace::Tracer) { - match self.wordlist_type { - WordlistType::Bip39 => t.component("Bip39Entry"), - WordlistType::Slip39 => t.component("Slip39Entry"), - } + t.component("MnemonicKeyboard"); // unified with TT t.string("textbox", self.textbox.content()); if self.offer_words { diff --git a/core/embed/rust/src/ui/model_tt/component/keyboard/bip39.rs b/core/embed/rust/src/ui/model_tt/component/keyboard/bip39.rs index 43beb8988..ba6c35f4c 100644 --- a/core/embed/rust/src/ui/model_tt/component/keyboard/bip39.rs +++ b/core/embed/rust/src/ui/model_tt/component/keyboard/bip39.rs @@ -239,3 +239,13 @@ impl Bip39Input { } } } + +// DEBUG-ONLY SECTION BELOW + +#[cfg(feature = "ui_debug")] +impl crate::trace::Trace for Bip39Input { + fn trace(&self, t: &mut dyn crate::trace::Tracer) { + t.component("Bip39Input"); + t.child("textbox", &self.textbox); + } +} diff --git a/core/embed/rust/src/ui/model_tt/component/keyboard/mnemonic.rs b/core/embed/rust/src/ui/model_tt/component/keyboard/mnemonic.rs index f16709fb5..90357882c 100644 --- a/core/embed/rust/src/ui/model_tt/component/keyboard/mnemonic.rs +++ b/core/embed/rust/src/ui/model_tt/component/keyboard/mnemonic.rs @@ -190,8 +190,14 @@ pub enum MnemonicInputMsg { } #[cfg(feature = "ui_debug")] -impl crate::trace::Trace for MnemonicKeyboard { +impl crate::trace::Trace for MnemonicKeyboard +where + T: MnemonicInput + crate::trace::Trace, + U: AsRef, +{ fn trace(&self, t: &mut dyn crate::trace::Tracer) { t.component("MnemonicKeyboard"); + t.child("prompt", &self.prompt); + t.child("input", &self.input); } } diff --git a/core/embed/rust/src/ui/model_tt/component/keyboard/slip39.rs b/core/embed/rust/src/ui/model_tt/component/keyboard/slip39.rs index b1671645f..65dd614f3 100644 --- a/core/embed/rust/src/ui/model_tt/component/keyboard/slip39.rs +++ b/core/embed/rust/src/ui/model_tt/component/keyboard/slip39.rs @@ -266,3 +266,13 @@ impl Slip39Mask { self.0.count_ones() <= 1 } } + +// DEBUG-ONLY SECTION BELOW + +#[cfg(feature = "ui_debug")] +impl crate::trace::Trace for Slip39Input { + fn trace(&self, t: &mut dyn crate::trace::Tracer) { + t.component("Slip39Input"); + t.child("textbox", &self.textbox); + } +}