move storage struct to EFR32DoorLock::Storage namespace

Author: mykrupp

examples/lock-app/silabs/include/LockManager.h

@@ -29,24 +29,6 @@
 
 #include <lib/support/DefaultStorageKeyAllocator.h>
 
-struct WeekDayScheduleInfo
-{
-    DlScheduleStatus status;
-    EmberAfPluginDoorLockWeekDaySchedule schedule;
-};
-
-struct YearDayScheduleInfo
-{
-    DlScheduleStatus status;
-    EmberAfPluginDoorLockYearDaySchedule schedule;
-};
-
-struct HolidayScheduleInfo
-{
-    DlScheduleStatus status;
-    EmberAfPluginDoorLockHolidaySchedule schedule;
-};
-
 namespace EFR32DoorLock {
 namespace ResourceRanges {
 // Used to size arrays
@@ -58,8 +40,6 @@ static constexpr uint8_t kMaxHolidaySchedules        = 10;
 static constexpr uint8_t kMaxCredentialSize          = 20;
 static constexpr uint8_t kNumCredentialTypes         = 6;
 
-static constexpr uint8_t kMaxCredentials = kMaxUsers * kMaxCredentialsPerUser;
-
 } // namespace ResourceRanges
 
 namespace LockInitParams {
@@ -109,34 +89,56 @@ class ParamBuilder
 };
 
 } // namespace LockInitParams
+namespace Storage {
+
+    using namespace EFR32DoorLock::ResourceRanges;
+    struct WeekDayScheduleInfo
+    {
+        DlScheduleStatus status;
+        EmberAfPluginDoorLockWeekDaySchedule schedule;
+    };
+    
+    struct YearDayScheduleInfo
+    {
+        DlScheduleStatus status;
+        EmberAfPluginDoorLockYearDaySchedule schedule;
+    };
+    
+    struct HolidayScheduleInfo
+    {
+        DlScheduleStatus status;
+        EmberAfPluginDoorLockHolidaySchedule schedule;
+    };
+    
+    struct LockUserInfo
+    {
+        char userName[DOOR_LOCK_MAX_USER_NAME_SIZE];
+        size_t userNameSize;
+        uint32_t userUniqueId;
+        UserStatusEnum userStatus;
+        UserTypeEnum userType;
+        CredentialRuleEnum credentialRule;
+        chip::EndpointId endpointId;
+        chip::FabricIndex createdBy;
+        chip::FabricIndex lastModifiedBy;
+        uint16_t currentCredentialCount;
+    };
+    
+    struct LockCredentialInfo
+    {
+        DlCredentialStatus status;
+        CredentialTypeEnum credentialType;
+        chip::FabricIndex createdBy;
+        chip::FabricIndex lastModifiedBy;
+        uint8_t credentialData[kMaxCredentialSize];
+        size_t credentialDataSize;
+    };
+} // namespace Storage
 } // namespace EFR32DoorLock
 
 using namespace ::chip;
 using namespace EFR32DoorLock::ResourceRanges;
-
-struct LockUserInfo
-{
-    char userName[DOOR_LOCK_MAX_USER_NAME_SIZE];
-    size_t userNameSize;
-    uint32_t userUniqueId;
-    UserStatusEnum userStatus;
-    UserTypeEnum userType;
-    CredentialRuleEnum credentialRule;
-    chip::EndpointId endpointId;
-    chip::FabricIndex createdBy;
-    chip::FabricIndex lastModifiedBy;
-    uint16_t currentCredentialCount;
-};
-
-struct LockCredentialInfo
-{
-    DlCredentialStatus status;
-    CredentialTypeEnum credentialType;
-    chip::FabricIndex createdBy;
-    chip::FabricIndex lastModifiedBy;
-    uint8_t credentialData[kMaxCredentialSize];
-    size_t credentialDataSize;
-};
+using namespace EFR32DoorLock::Storage;
 
 class LockManager
 {

examples/lock-app/silabs/src/LockManager.cpp

@@ -26,6 +26,7 @@
 
 using chip::app::DataModel::MakeNullable;
 using namespace ::chip::DeviceLayer::Internal;
+using namespace EFR32DoorLock;
 using namespace EFR32DoorLock::LockInitParams;
 
 namespace {