refactor(core/mercury): separate upy args parsing #4182
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Similar thing was done here for bootloader and "common". Need to take a look how to take the same/similar approach for firmware. #3658 |
obrusvit
force-pushed
the
obrusvit/mercury/refactor-rust-layout-upy-parsing
branch
2 times, most recently
from
7b39754
to
d4a159d
Compare
- removes 2nd definition of ConfirmBlobParams, the choice of fields and what supplied in ctor and what in `with_` methods should be thought through again. [no changelog]
obrusvit
force-pushed
the
obrusvit/mercury/refactor-rust-layout-upy-parsing
branch
from
d4a159d
to
b616b27
Compare
[no changelog]
Supply the rust layout with dedicated paremeter type instead of plain micropython::Obj. The types used are ConfirmBlobParams and ShowInfoParams. [no changelog]
obrusvit
force-pushed
the
obrusvit/mercury/refactor-rust-layout-upy-parsing
branch
from
b616b27
to
58347bc
Compare
|
The only conflict with #3686 should be: |
mmilata
approved these changes
Oct 3, 2024
| case_sensitive: bool, | ||
| account: Option<TString<'static>>, | ||
| path: Option<TString<'static>>, | ||
| xpubs: Obj, // TODO: get rid of Obj |
There was a problem hiding this comment.
Perhaps this can use some kind of closure?
| @@ -1540,16 +1866,16 @@ pub static mp_module_trezorui2: Module = obj_module! { | |||
| /// br_code: ButtonRequestType, | |||
| /// br_name: str, | |||
| /// ) -> LayoutObj[tuple[UiResult, int]]: | |||
| /// """Numer input with + and - buttons, description, and context menu with cancel and | |||
| /// """Numebr input with + and - buttons, description, and context menu with cancel and | |||
There was a problem hiding this comment.
Suggested change
| /// """Numebr input with + and - buttons, description, and context menu with cancel and | |
| /// """Number input with + and - buttons, description, and context menu with cancel and |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR separates the Rust flows from micropython layer.
The idea is to do the uPy argument parsing in
ui/model_mercury/layout.rsand then pass them as regular arguments to code inui/model_mercury/flow/**.rs, i.e. they won't be passed asargs: &[Obj], kwargs: &Map. The goal is to keep the rust flows independent frommicropythonsub-crate. This separation is done for two reasons:flowscreation whichThis PR has no impact on UI or features.
TODO:
ObjandIterBufget_address.rs, postponing this for now