GH-43: Refactor modifier_type_t and modifier_node_id

Bug-SiliconLabs: UIC-3222
Bug-GitHub: #43
Signed-off-by: Philippe Coval <[email protected]>

Author: silabs-borisl

applications/zpc/components/zcl_cluster_servers/test/user_credential_cluster_server_test.cpp

@@ -389,8 +389,8 @@ attribute_store_node_t helper_add_complete_user(
 
   // Reported attributes by the end device
   // Need those to test MQTT topics
-  user_credential_user_modifier_node_id_t modifier_node_id = 1212;
-  user_credential_user_modifier_type_t modifier_type = ZCL_USER_MODIFIER_TYPE_LOCALLY;
+  user_credential_modifier_node_id_t modifier_node_id = 1212;
+  user_credential_modifier_type_t modifier_type = ZCL_USER_MODIFIER_TYPE_LOCALLY;
   mock_expected_user_mqtt_topic(user_id,
                                 "UserModifierNodeId",
                                 static_cast<uint32_t>(modifier_node_id));

applications/zpc/components/zpc_attribute_store/include/command_class_types/zwave_command_class_user_credential_types.h

@@ -36,9 +36,11 @@ typedef uint16_t user_credential_all_users_checksum_t;
 ///> User Unique ID. uint16_t
 typedef uint16_t user_credential_user_unique_id_t;
 ///> User Modifier Type. uint8_t
-typedef uint8_t user_credential_user_modifier_type_t;
+typedef uint8_t user_credential_modifier_type_t;
 ///> User Modifier Node ID. uint16_t
-typedef uint16_t user_credential_user_modifier_node_id_t;
+typedef uint16_t user_credential_modifier_node_id_t;
+
+
 ///> User Type. uint8_t
 #define USER_CREDENTIAL_USER_TYPE_GENERAL_USER 0x00
 #define USER_CREDENTIAL_USER_TYPE_PROGRAMMING_USER 0x03
@@ -68,11 +70,6 @@ typedef uint16_t user_credential_slot_t;
 #define USER_CREDENTIAL_OPERATION_TYPE_DELETE 0x02
 typedef uint8_t user_credential_operation_type_t;
 
-///> Credential Modifier Type. uint8_t
-typedef uint8_t user_credential_modifier_type_t;
-///> Credential Modifier Node ID. uint16_t
-typedef uint16_t user_credential_modifier_node_id_t;
-
 ///> Expiring Timeout for User (Minutes). uint16_t
 typedef uint16_t user_credential_expiring_timeout_minutes_t;
 

applications/zpc/components/zwave_command_classes/src/zwave_command_class_user_credential.cpp

@@ -623,7 +623,7 @@ user_credential_user_unique_id_t get_user_id(const uint8_t *event_parameters)
   return get_uint16_value(event_parameters, INDEX_USER_UNIQUE_ID);
 }
 
-user_credential_user_modifier_type_t
+user_credential_modifier_type_t
   get_user_modifier_type(const uint8_t *event_parameters)
 {
   return event_parameters[INDEX_USER_MODIFIER_TYPE];
@@ -910,7 +910,7 @@ void on_notification_event(attribute_store_node_t endpoint_node,
       }
 
       // If user doesn't exists in the device we try to remove it also from our side
-      user_credential_user_modifier_type_t modifier_type
+      user_credential_modifier_type_t modifier_type
         = notification_handler::user::get_user_modifier_type(event_parameters);
       if (modifier_type == USER_REPORT_DNE) {
         attribute_store_delete_node(user_id_node);

applications/zpc/components/zwave_command_classes/test/zwave_command_class_user_credential_test.cpp

@@ -926,8 +926,8 @@ void test_user_credential_user_get_not_found()
 
 std::vector<uint8_t> helper_create_user_report_frame(
   user_credential_user_unique_id_t next_user_id,
-  user_credential_user_modifier_type_t user_modifier_type,
-  user_credential_user_modifier_node_id_t user_modifier_node_id,
+  user_credential_modifier_type_t user_modifier_type,
+  user_credential_modifier_node_id_t user_modifier_node_id,
   user_credential_user_unique_id_t user_id,
   user_credential_user_type_t user_type,
   user_credential_user_active_state_t user_active_state,
@@ -970,8 +970,8 @@ std::vector<uint8_t> helper_create_user_report_frame(
 };
 
 std::vector<uint8_t> helper_create_user_notification_report(
-  user_credential_user_modifier_type_t user_modifier_type,
-  user_credential_user_modifier_node_id_t user_modifier_node_id,
+  user_credential_modifier_type_t user_modifier_type,
+  user_credential_modifier_node_id_t user_modifier_node_id,
   user_credential_user_unique_id_t user_id,
   user_credential_user_type_t user_type,
   user_credential_user_active_state_t user_active_state,
@@ -1057,8 +1057,8 @@ void test_user_credential_user_report_happy_case()
   constexpr user_credential_user_unique_id_t EXPECTED_SECOND_USER_ID = 1212;
 
   user_credential_user_unique_id_t next_user_id = EXPECTED_SECOND_USER_ID;
-  user_credential_user_modifier_type_t user_modifier_type       = 2;
-  user_credential_user_modifier_node_id_t user_modifier_node_id = 1313;
+  user_credential_modifier_type_t user_modifier_type       = 2;
+  user_credential_modifier_node_id_t user_modifier_node_id = 1313;
   user_credential_user_unique_id_t user_id = EXPECTED_FIRST_USER_ID;
   user_credential_user_type_t user_type    = 3;
   user_credential_user_active_state_t user_active_state               = 1;
@@ -1536,8 +1536,8 @@ std::vector<uint8_t> helper_create_credential_report_frame(
   user_credential_slot_t credential_slot,
   uint8_t crb,
   std::vector<uint8_t> credential_data,
-  user_credential_user_modifier_type_t credential_modifier_type,
-  user_credential_user_modifier_node_id_t credential_modifier_node_id,
+  user_credential_modifier_type_t credential_modifier_type,
+  user_credential_modifier_node_id_t credential_modifier_node_id,
   user_credential_type_t next_credential_type,
   user_credential_slot_t next_credential_slot)
 {
@@ -1703,8 +1703,8 @@ void test_user_credential_credential_report_happy_case()
   user_credential_slot_t credential_slot   = 1212;
   uint8_t crb                              = 1;
   std::vector<uint8_t> credential_data     = {12, 13, 14, 15, 16};
-  user_credential_user_modifier_type_t credential_modifier_type       = 13;
-  user_credential_user_modifier_node_id_t credential_modifier_node_id = 1312;
+  user_credential_modifier_type_t credential_modifier_type       = 13;
+  user_credential_modifier_node_id_t credential_modifier_node_id = 1312;
   user_credential_type_t next_credential_type                         = 12;
   user_credential_slot_t next_credential_slot                         = 1;
 
@@ -2190,8 +2190,8 @@ void test_user_credential_user_notification_add_modify_delete_happy_case()
                            "An user node should exist");
 
   // Create notification report frame
-  user_credential_user_modifier_type_t user_modifier_type       = 2;
-  user_credential_user_modifier_node_id_t user_modifier_node_id = 1212;
+  user_credential_modifier_type_t user_modifier_type       = 2;
+  user_credential_modifier_node_id_t user_modifier_node_id = 1212;
 
   auto user_notification_report_frame
     = helper_create_user_notification_report(user_modifier_type,