read other types

Author: abenso

app/src/metadata_reader.c

@@ -158,10 +158,12 @@ parser_error_t read_byte_display(parser_context_t *ctx, byte_display_t *display)
             printf("byte display decimal\n");
             break;
         case BYTE_DISPLAY_BECH32:
-            printf("TODO:byte display bech32!!!!!!!!!!!!!!!! \n");
+            printf("byte display bech32\n");
+            CHECK_ERROR(read_hrp(ctx, &display->bech32.prefix));
             break;
         case BYTE_DISPLAY_BECH32M:
-            CHECK_ERROR(read_hrp(ctx, &display->bech32.prefix));
+            printf("byte display bech32m\n");
+            CHECK_ERROR(read_hrp(ctx, &display->bech32m.prefix));
             break;
         case BYTE_DISPLAY_BASE58:
             printf("byte display base58\n");
@@ -529,7 +531,6 @@ parser_error_t metadata_read(parser_context_t *ctx, parser_tx_t *txObj) {
         return parser_too_many_schemes;
     }
 
-    // TODO: go through all schemes
     for (uint32_t i = 0; i < txObj->schema.types.qty; i++) {
         // read type
         CHECK_ERROR(read_u8(ctx, (uint8_t*)&txObj->schema.types.schemes[i].type));
@@ -554,6 +555,39 @@ parser_error_t metadata_read(parser_context_t *ctx, parser_tx_t *txObj) {
                 CHECK_ERROR(read_link(ctx, &txObj->schema.types.schemes[i].option_type));
                 print_string("READING OPTION DONE\n");
                 break;
+            case LINKING_SCHEME_INTEGER:
+                print_string("READING INTEGER");
+                CHECK_ERROR(read_primitive_integer(ctx, &txObj->schema.types.schemes[i].integer_type));
+                print_string("READING INTEGER DONE\n");
+                break;
+            case LINKING_SCHEME_BYTE_ARRAY:
+                print_string("READING BYTE ARRAY");
+                CHECK_ERROR(read_primitive_byte_array(ctx, &txObj->schema.types.schemes[i].byte_array_type));
+                print_string("READING BYTE ARRAY DONE\n");
+                break;
+            case LINKING_SCHEME_FLOAT32:
+                print_string("READING FLOAT32");
+                break;
+            case LINKING_SCHEME_FLOAT64:
+                print_string("READING FLOAT64");
+                break;
+            case LINKING_SCHEME_STRING:
+                print_string("READING STRING");
+                break;
+            case LINKING_SCHEME_BOOLEAN:
+                print_string("READING BOOLEAN");
+                break;
+            case LINKING_SCHEME_SKIP:
+                print_string("READING SKIP");
+                CHECK_ERROR(read_u64(ctx, (uint64_t*)&txObj->schema.types.schemes[i].skip_type));
+                printf("skip_type: %llu\n", txObj->schema.types.schemes[i].skip_type);
+                print_string("READING SKIP DONE\n");
+                break;
+            case LINKING_SCHEME_BYTE_VEC:
+                print_string("READING BYTE VEC");
+                CHECK_ERROR(read_byte_display(ctx, &txObj->schema.types.schemes[i].byte_vec_type));
+                print_string("READING BYTE VEC DONE\n");
+                break;
             case LINKING_SCHEME_ARRAY:
                 print_string("READING ARRAY");
                 CHECK_ERROR(read_array(ctx, &txObj->schema.types.schemes[i].array_type));
@@ -564,6 +598,12 @@ parser_error_t metadata_read(parser_context_t *ctx, parser_tx_t *txObj) {
                 CHECK_ERROR(read_link(ctx, &txObj->schema.types.schemes[i].vec_type));
                 print_string("READING VEC DONE\n");
                 break;
+            case LINKING_SCHEME_MAP:
+                print_string("READING MAP");
+                CHECK_ERROR(read_link(ctx, &txObj->schema.types.schemes[i].map_type.key));
+                CHECK_ERROR(read_link(ctx, &txObj->schema.types.schemes[i].map_type.value));
+                print_string("READING MAP DONE\n");
+                break;
             default:
                 printf("UNKNOWN TYPE: %d\n", txObj->schema.types.schemes[i].type);
                 return parser_no_data;

app/src/parser_txdef.h

@@ -121,10 +121,15 @@ typedef struct {
     hrp_t prefix;
 } byte_display_bech32_t;
 
+typedef struct {
+    hrp_t prefix;
+} byte_display_bech32m_t;
+
 typedef struct {
     byte_display_type_t type;
     union {
         byte_display_bech32_t bech32;
+        byte_display_bech32m_t bech32m;
     };
 } byte_display_t;
 
@@ -236,15 +241,25 @@ typedef struct {
     link_t value;
 } schema_array_t;
 
+typedef struct {
+    link_t key;
+    link_t value;
+} schema_map_t;
+
 typedef struct {
    linking_scheme_type_t type;
    union {
     schema_enum_t enum_type;
     schema_struct_t struct_type;
     schema_tuple_t tuple_type;
     link_t option_type;
-    link_t vec_type;
+    primitive_integer_t integer_type;
+    primitive_byte_array_t byte_array_type;
+    uint64_t skip_type;
+    byte_display_t byte_vec_type;
     schema_array_t array_type;
+    link_t vec_type;
+    schema_map_t map_type;
    };
 } linking_scheme_t;