Skip to content

Commit 408cf0f

Browse files
abensoabenso
committed
clean code
1 parent 823c7b0 commit 408cf0f

4 files changed

Lines changed: 26 additions & 125 deletions

File tree

‎app/src/render.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,37 +116,30 @@ parser_error_t render_integer(parser_context_t *ctx, primitive_integer_t *primit
116116
switch (primitive->type) {
117117
case INTEGER_I8:
118118
case INTEGER_U8: {
119-
print_u8("INTEGER_U8: ", primitive->type);
120119
uint8_t *ptr = (uint8_t *)&value;
121120
CHECK_ERROR(read_u8(ctx, ptr));
122121
break;
123122
}
124123
case INTEGER_I16:
125124
case INTEGER_U16: {
126-
print_u8("INTEGER_U16: ", primitive->type);
127125
uint16_t *ptr = (uint16_t *)&value;
128126
CHECK_ERROR(read_u16(ctx, ptr));
129127
break;
130128
}
131129
case INTEGER_I32:
132130
case INTEGER_U32: {
133-
print_u8("INTEGER_U32: ", primitive->type);
134131
uint32_t *ptr = (uint32_t *)&value;
135132
CHECK_ERROR(read_u32(ctx, ptr));
136133
break;
137134
}
138135
case INTEGER_I64:
139136
case INTEGER_U64: {
140-
print_u8("INTEGER_U64: ", primitive->type);
141137
CHECK_ERROR(read_u64(ctx, &value.lo));
142138
break;
143139
}
144140
case INTEGER_I128:
145141
case INTEGER_U128: {
146-
print_u8("INTEGER_U128_1: ", primitive->type);
147-
print_buffer(&ctx->buffer, "INTEGER_U128 buffer!!!!!!!!!!!!!!");
148142
CHECK_ERROR(read_u64(ctx, &value.lo));
149-
print_u8("INTEGER_U128_2: ", primitive->type);
150143
CHECK_ERROR(read_u64(ctx, &value.hi));
151144
break;
152145
}

‎app/src/schema_display.c‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,12 @@ parser_error_t schema_display_enum(parser_context_t *ctx, parser_tx_t *txObj) {
200200
if (variant.has_value && variant.value.tag == LINK_BY_INDEX) {
201201
bool remove_variant = false;
202202
if (!variant.hide_tag && !enum_type.hide_tag) {
203-
CHECK_ERROR(append_item_title_new((char *)variant.name.ptr, variant.name.len));
203+
CHECK_ERROR(append_item_title((char *)variant.name.ptr, variant.name.len));
204204
remove_variant = true;
205205
}
206206
CHECK_ERROR(schema_display_generic_by_index(ctx, txObj, variant.value.data.by_index));
207207
if (remove_variant) {
208208
CHECK_ERROR(remove_last_item_title());
209-
CHECK_ERROR(remove_last_item_title_new());
210209
}
211210
} else {
212211
parser_context_t ctx_bytes = {0};
@@ -242,7 +241,7 @@ parser_error_t schema_display_struct(parser_context_t *ctx, parser_tx_t *txObj)
242241
sizeof(structured_show_as)));
243242
uint16_t len = strlen(structured_show_as);
244243
if (len > 0) {
245-
CHECK_ERROR(append_item_title_new(structured_show_as, len));
244+
CHECK_ERROR(append_item_title(structured_show_as, len));
246245
try_push = true;
247246
}
248247
} else {
@@ -264,31 +263,28 @@ parser_error_t schema_display_struct(parser_context_t *ctx, parser_tx_t *txObj)
264263

265264
if (try_push) {
266265
if (!is_data_context_empty()) {
267-
CHECK_ERROR(push_item_new(txObj));
268-
CHECK_ERROR(remove_last_item_title_new());
266+
CHECK_ERROR(push_item(txObj));
267+
CHECK_ERROR(remove_last_item_title());
269268
}
270269
} else {
271270
// TODO: check if this is correct
272271
}
273272
}
274273
} else {
275274
for (uint32_t i = 0; i < struct_type.fields_qty; i++) {
276-
if (i == 2) {
277-
print_string("schema_display_struct IMPLEMENT ME 2");
278-
}
279275
MEMZERO(&named_field, sizeof(named_field_t));
280276
CHECK_ERROR(read_named_field(&struct_type.named_fields, &named_field));
281277
bool remove_variant = false;
282278
if ((!named_field.silent && !is_link_skip(&named_field.value) && !named_field.is_expert) || ui_expert_mode) {
283-
CHECK_ERROR(append_item_title_new((char *)named_field.display_name.ptr, named_field.display_name.len));
279+
CHECK_ERROR(append_item_title((char *)named_field.display_name.ptr, named_field.display_name.len));
284280
remove_variant = true;
285281
}
286282
CHECK_ERROR(schema_display_generic_by_index(ctx, txObj, named_field.value.data.by_index));
287283
if (remove_variant) {
288284
if (!is_data_context_empty()) {
289-
CHECK_ERROR(push_item_new(txObj));
285+
CHECK_ERROR(push_item(txObj));
290286
}
291-
CHECK_ERROR(remove_last_item_title_new());
287+
CHECK_ERROR(remove_last_item_title());
292288
}
293289
}
294290
}
@@ -340,10 +336,10 @@ parser_error_t schema_display_tuple(parser_context_t *ctx, parser_tx_t *txObj) {
340336
if (!unnamed_field.is_expert || ui_expert_mode) {
341337
char index_str[12] = {0};
342338
snprintf(index_str, sizeof(index_str), "%u", i);
343-
CHECK_ERROR(append_item_title_new(index_str, strlen(index_str)));
339+
CHECK_ERROR(append_item_title(index_str, strlen(index_str)));
344340
if (!is_data_context_empty()) {
345-
CHECK_ERROR(push_item_new(txObj));
346-
CHECK_ERROR(remove_last_item_title_new());
341+
CHECK_ERROR(push_item(txObj));
342+
CHECK_ERROR(remove_last_item_title());
347343
}
348344
}
349345
}
@@ -400,22 +396,22 @@ parser_error_t schema_display_array(parser_context_t *ctx, parser_tx_t *txObj) {
400396
for (uint32_t i = 0; i < array_type.len; i++) {
401397
char index_str[12];
402398
snprintf(index_str, sizeof(index_str), "%d", i);
403-
CHECK_ERROR(append_item_title_new(index_str, strlen(index_str)));
399+
CHECK_ERROR(append_item_title(index_str, strlen(index_str)));
404400
switch (array_type.value.tag) {
405401
case LINK_BY_INDEX:
406402
CHECK_ERROR(schema_display_generic_by_index(ctx, txObj, array_type.value.data.by_index));
407403
if (!is_data_context_empty()) {
408-
CHECK_ERROR(push_item_new(txObj));
409-
CHECK_ERROR(remove_last_item_title_new());
404+
CHECK_ERROR(push_item(txObj));
405+
CHECK_ERROR(remove_last_item_title());
410406
}
411407
break;
412408
case LINK_IMMEDIATE: {
413409
CHECK_ERROR(schema_display_primitive(ctx, txObj, &array_type.value.data.immediate));
414410
if (!is_data_context_empty()) {
415-
CHECK_ERROR(push_item_new(txObj));
416-
CHECK_ERROR(remove_last_item_title_new());
411+
CHECK_ERROR(push_item(txObj));
412+
CHECK_ERROR(remove_last_item_title());
417413
if (i == array_type.len - 1) {
418-
CHECK_ERROR(remove_last_item_title_new());
414+
CHECK_ERROR(remove_last_item_title());
419415
}
420416
}
421417
break;
@@ -450,13 +446,13 @@ parser_error_t schema_display_vec(parser_context_t *ctx, parser_tx_t *txObj) {
450446
case LINK_IMMEDIATE: {
451447
char index_str[12];
452448
snprintf(index_str, sizeof(index_str), "%d", i);
453-
CHECK_ERROR(append_item_title_new(index_str, strlen(index_str)));
449+
CHECK_ERROR(append_item_title(index_str, strlen(index_str)));
454450
CHECK_ERROR(schema_display_primitive(ctx, txObj, &vec_type.value.data.immediate));
455451
if (!is_data_context_empty()) {
456-
CHECK_ERROR(push_item_new(txObj));
457-
CHECK_ERROR(remove_last_item_title_new());
452+
CHECK_ERROR(push_item(txObj));
453+
CHECK_ERROR(remove_last_item_title());
458454
if (i == vec_len - 1) {
459-
CHECK_ERROR(remove_last_item_title_new());
455+
CHECK_ERROR(remove_last_item_title());
460456
}
461457
}
462458
break;
@@ -521,7 +517,6 @@ parser_error_t schema_parser_transaction(parser_context_t *ctx, parser_tx_t *txO
521517
ui_expert_mode = app_mode_expert();
522518

523519
init_item_title_buffer(NULL);
524-
init_item_title_buffer_new(NULL);
525520
set_enable_push_item(true);
526521

527522
txObj->unsigned_transaction_raw.buffer.ptr = ctx->buffer.ptr + ctx->offset;

‎app/src/ui_item_manager.c‎

Lines changed: 4 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "zxmacros.h"
2828

2929
item_buffer_t item_title_buffer = {0};
30-
item_buffer_t item_title_buffer_new = {0};
3130
primitive_t primitive;
3231
parser_context_t data_context;
3332
static bool data_context_full = false;
@@ -38,10 +37,6 @@ void init_item_title_buffer(const char *initial_data) {
3837
init_item_buffer(&item_title_buffer, initial_data, SEPARATOR_TITLE_OPEN, SEPARATOR_TITLE_CLOSE);
3938
}
4039

41-
void init_item_title_buffer_new(const char *initial_data) {
42-
init_item_buffer(&item_title_buffer_new, initial_data, SEPARATOR_TITLE_OPEN, SEPARATOR_TITLE_CLOSE);
43-
}
44-
4540
parser_error_t append_item_title(const char *buffer, uint16_t input_len) {
4641
if (!item_title_buffer.initialized) {
4742
init_item_title_buffer(NULL);
@@ -54,18 +49,6 @@ parser_error_t append_item_title(const char *buffer, uint16_t input_len) {
5449
return parser_ok;
5550
}
5651

57-
parser_error_t append_item_title_new(const char *buffer, uint16_t input_len) {
58-
if (!item_title_buffer_new.initialized) {
59-
init_item_title_buffer_new(NULL);
60-
}
61-
CHECK_ERROR(append_item_buffer(&item_title_buffer_new, buffer, input_len));
62-
63-
print_string("Appended variant name\n");
64-
print_string(item_title_buffer_new.data);
65-
66-
return parser_ok;
67-
}
68-
6952
parser_error_t remove_last_item_title() {
7053
CHECK_ERROR(remove_last_item_buffer(&item_title_buffer));
7154

@@ -75,53 +58,25 @@ parser_error_t remove_last_item_title() {
7558
return parser_ok;
7659
}
7760

78-
parser_error_t remove_last_item_title_new() {
79-
CHECK_ERROR(remove_last_item_buffer(&item_title_buffer_new));
80-
81-
print_string("Removed last variant\n");
82-
print_string(item_title_buffer_new.data);
83-
84-
return parser_ok;
85-
}
86-
8761
parser_error_t get_title_item_qty(uint8_t *qty) {
8862
CHECK_INPUT(qty);
8963
return get_item_buffer_qty(&item_title_buffer, qty);
9064
}
9165

92-
parser_error_t get_title_item_qty_new(uint8_t *qty) {
93-
CHECK_INPUT(qty);
94-
return get_item_buffer_qty(&item_title_buffer_new, qty);
95-
}
96-
9766
void clear_item_title_buffer() { clear_item_buffer(&item_title_buffer); }
9867

99-
void clear_item_title_buffer_new() { clear_item_buffer(&item_title_buffer_new); }
100-
10168
bool is_item_title_empty() {
10269
bool is_empty = false;
10370
is_item_buffer_empty(&item_title_buffer, &is_empty);
10471
return is_empty;
10572
}
10673

107-
bool is_item_title_empty_new() {
108-
bool is_empty = false;
109-
is_item_buffer_empty(&item_title_buffer_new, &is_empty);
110-
return is_empty;
111-
}
112-
11374
parser_error_t get_item_title(char *item_title, uint16_t item_title_len) {
11475
CHECK_INPUT(item_title);
11576
CHECK_ERROR(get_item_buffer_content(&item_title_buffer, 0, item_title, item_title_len));
11677
return parser_ok;
11778
}
11879

119-
parser_error_t get_item_title_new(char *item_title, uint16_t item_title_len) {
120-
CHECK_INPUT(item_title);
121-
CHECK_ERROR(get_item_buffer_content(&item_title_buffer_new, 0, item_title, item_title_len));
122-
return parser_ok;
123-
}
124-
12580
parser_error_t create_item_title(uint16_t index_start, uint16_t index_end, char *output, uint16_t output_len) {
12681
CHECK_INPUT(output);
12782

@@ -148,42 +103,11 @@ parser_error_t create_item_title(uint16_t index_start, uint16_t index_end, char
148103
return parser_ok;
149104
}
150105

151-
parser_error_t create_item_title_new(uint16_t index_start, uint16_t index_end, char *output, uint16_t output_len) {
152-
CHECK_INPUT(output);
153-
154-
MEMZERO(output, output_len);
155-
156-
// TODO: remove this
157-
char content[100] = {0};
158-
159-
if (index_start >= index_end) {
160-
return parser_ui_item_title_empty;
161-
}
162-
163-
for (uint8_t i = index_start; i < index_end; i++) {
164-
CHECK_ERROR(get_item_buffer_content(&item_title_buffer_new, i, content, sizeof(content)));
165-
strncat(output, content, strlen(content));
166-
if (i < index_end - 1) {
167-
strncat(output, SEPARATOR_TITLE_DISPLAY, strlen(SEPARATOR_TITLE_DISPLAY));
168-
}
169-
}
170-
171-
print_string("Create item title: ");
172-
print_string(output);
173-
174-
return parser_ok;
175-
}
176-
177106
parser_error_t get_item_title_range_length(uint16_t index_start, uint16_t index_end, size_t *total_length) {
178107
CHECK_ERROR(get_item_buffer_range_length(&item_title_buffer, index_start, index_end, total_length));
179108
return parser_ok;
180109
}
181110

182-
parser_error_t get_item_title_range_length_new(uint16_t index_start, uint16_t index_end, size_t *total_length) {
183-
CHECK_ERROR(get_item_buffer_range_length(&item_title_buffer_new, index_start, index_end, total_length));
184-
return parser_ok;
185-
}
186-
187111
parser_error_t set_primitive(primitive_t *value) {
188112
CHECK_INPUT(value);
189113
MEMZERO(&primitive, sizeof(primitive));
@@ -203,7 +127,7 @@ bool is_data_context_empty() { return !data_context_full; }
203127

204128
void set_enable_push_item(bool value) { enable_push_item = value; }
205129

206-
parser_error_t push_item_new(parser_tx_t *txObj) {
130+
parser_error_t push_item(parser_tx_t *txObj) {
207131
CHECK_INPUT(txObj);
208132

209133
if (!enable_push_item) {
@@ -215,13 +139,13 @@ parser_error_t push_item_new(parser_tx_t *txObj) {
215139
return parser_too_many_items;
216140
}
217141

218-
uint16_t title_len = strlen(item_title_buffer_new.data);
142+
uint16_t title_len = strlen(item_title_buffer.data);
219143
if (title_len > MAX_STRING_LENGTH) {
220144
return parser_push_item_too_long;
221145
}
222146

223-
MEMCPY(txObj->ui_items_new.items[txObj->ui_items_new.qty].title, item_title_buffer_new.data,
224-
strlen(item_title_buffer_new.data));
147+
MEMCPY(txObj->ui_items_new.items[txObj->ui_items_new.qty].title, item_title_buffer.data,
148+
strlen(item_title_buffer.data));
225149
txObj->ui_items_new.items[txObj->ui_items_new.qty].primitive = primitive;
226150
txObj->ui_items_new.items[txObj->ui_items_new.qty].data_context = data_context;
227151
txObj->ui_items_new.qty++;

‎app/src/ui_item_manager.h‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,9 @@ parser_error_t get_item_title(char *item_title, uint16_t item_title_len);
2727
parser_error_t create_item_title(uint16_t index_start, uint16_t index_end, char *output, uint16_t output_len);
2828
parser_error_t get_item_title_range_length(uint16_t index_start, uint16_t index_end, size_t *total_length);
2929

30-
// Item title new
31-
void init_item_title_buffer_new(const char *initial_data);
32-
parser_error_t append_item_title_new(const char *input, uint16_t input_len);
33-
parser_error_t remove_last_item_title_new();
34-
parser_error_t get_title_item_qty_new(uint8_t *qty);
35-
bool is_item_title_empty_new();
36-
parser_error_t get_item_title_new(char *item_title, uint16_t item_title_len);
37-
parser_error_t create_item_title_new(uint16_t index_start, uint16_t index_end, char *output, uint16_t output_len);
38-
parser_error_t get_item_title_range_length_new(uint16_t index_start, uint16_t index_end, size_t *total_length);
39-
40-
bool is_data_context_empty();
41-
4230
parser_error_t set_primitive(primitive_t *value);
4331
parser_error_t set_data_context(parser_context_t *context);
32+
bool is_data_context_empty();
4433

4534
void set_enable_push_item(bool value);
46-
parser_error_t push_item_new(parser_tx_t *txObj);
35+
parser_error_t push_item(parser_tx_t *txObj);

0 commit comments

Comments
 (0)