applications: matter_bridge: Revert loading of UniqueID from old scheme

Revert add loading of UniqueID from old data scheme.

Signed-off-by: Adrian Gielniewski <[email protected]>

Author: adigie

samples/matter/common/src/bridge/bridge_storage_manager.cpp

@@ -70,11 +70,6 @@ bool BridgeStorageManager::MigrateData()
 					return false;
 				}
 
-				if (!LoadBridgedDeviceUniqueID(device.mUniqueID, sizeof(device.mUniqueID),
-							       device.mUniqueIDLength, i)) {
-					return false;
-				}
-
 				/* Ignore an error, as node label is optional, so it may not be found. */
 				if (!LoadBridgedDeviceNodeLabel(device.mNodeLabel, sizeof(device.mNodeLabel),
 								device.mNodeLabelLength, i)) {
@@ -104,7 +99,6 @@ bool BridgeStorageManager::MigrateData()
 
 				/* Remove all information described using an old scheme. */
 				RemoveBridgedDeviceEndpointId(i);
-				RemoveBridgedDeviceUniqueID(i);
 				RemoveBridgedDeviceNodeLabel(i);
 				RemoveBridgedDeviceType(i);
 
@@ -166,21 +160,6 @@ bool BridgeStorageManager::RemoveBridgedDeviceEndpointId(uint8_t bridgedDeviceIn
 	return Nrf::GetPersistentStorage().NonSecureRemove(&id);
 }
 
-bool BridgeStorageManager::LoadBridgedDeviceUniqueID(char *uniqueID, size_t uniqueIDMaxLength, size_t &uniqueIDLength,
-						     uint8_t bridgedDeviceIndex)
-{
-	Nrf::PersistentStorageNode id = CreateIndexNode(bridgedDeviceIndex, &mBridgedDeviceUniqueID);
-
-	return Nrf::GetPersistentStorage().NonSecureLoad(&id, uniqueID, uniqueIDMaxLength, uniqueIDLength);
-}
-
-bool BridgeStorageManager::RemoveBridgedDeviceUniqueID(uint8_t bridgedDeviceIndex)
-{
-	Nrf::PersistentStorageNode id = CreateIndexNode(bridgedDeviceIndex, &mBridgedDeviceUniqueID);
-
-	return Nrf::GetPersistentStorage().NonSecureRemove(&id);
-}
-
 bool BridgeStorageManager::LoadBridgedDeviceNodeLabel(char *label, size_t labelMaxLength, size_t &labelLength,
 						      uint8_t bridgedDeviceIndex)
 {

samples/matter/common/src/bridge/bridge_storage_manager.h

@@ -52,7 +52,6 @@ class BridgeStorageManager {
 		  mBridgedDevicesIndexes("brd_ids", strlen("brd_ids"), &mBridge),
 		  mBridgedDevice("brd", strlen("brd"), &mBridge), mVersion("ver", strlen("ver"), &mBridge),
 		  mBridgedDeviceEndpointId("eid", strlen("eid"), &mBridgedDevice),
-		  mBridgedDeviceUniqueID("unique_id", strlen("unique_id"), &mBridgedDevice),
 		  mBridgedDeviceNodeLabel("label", strlen("label"), &mBridgedDevice),
 		  mBridgedDeviceType("type", strlen("type"), &mBridgedDevice)
 #ifdef CONFIG_BRIDGED_DEVICE_BT
@@ -186,28 +185,6 @@ class BridgeStorageManager {
 	 */
 	bool RemoveBridgedDeviceEndpointId(uint8_t bridgedDeviceIndex);
 
-	/**
-	 * @brief Load bridged device UniqueID from settings
-	 *
-	 * @param uniqueID address of char array to be filled with loaded data
-	 * @param uniqueIDMaxLength maximum size that can be used for UniqueID array
-	 * @param uniqueIDLength reference to the uniqueIDLength object to be filled with size of actually loaded data
-	 * @param bridgedDeviceIndex index describing specific bridged device using given uniqueID
-	 * @return true if key has been loaded successfully
-	 * @return false an error occurred
-	 */
-	bool LoadBridgedDeviceUniqueID(char *uniqueID, size_t uniqueIDMaxLength, size_t &uniqueIDLength,
-				       uint8_t bridgedDeviceIndex);
-
-	/**
-	 * @brief Remove bridged device's UniqueID entry from settings
-	 *
-	 * @param bridgedDeviceIndex index describing specific bridged device's UniqueID to be removed
-	 * @return true if key entry has been removed successfully
-	 * @return false an error occurred
-	 */
-	bool RemoveBridgedDeviceUniqueID(uint8_t bridgedDeviceIndex);
-
 	/**
 	 * @brief Load bridged device node label from settings
 	 *
@@ -281,7 +258,6 @@ class BridgeStorageManager {
 	/* The below fields are deprecated and used only for the migration purposes between the older scheme versions.
 	 */
 	Nrf::PersistentStorageNode mBridgedDeviceEndpointId;
-	Nrf::PersistentStorageNode mBridgedDeviceUniqueID;
 	Nrf::PersistentStorageNode mBridgedDeviceNodeLabel;
 	Nrf::PersistentStorageNode mBridgedDeviceType;
 #ifdef CONFIG_BRIDGED_DEVICE_BT