From f2712264cd05c87b575564b6e309f9b39b5a4802 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@apple.com>
Date: Fri, 28 Jul 2023 20:40:05 -0400
Subject: [PATCH] Allow MTRDeviceControllerFactory to store a more generic
 storage delegate. (#28383)

We might not always use MTRPersistentStorageDelegateBridge.
---
 .../CHIP/MTRDeviceControllerFactory.mm        | 26 +++++++++----------
 .../MTRDeviceControllerFactory_Internal.h     |  5 ++--
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
index 053a3a5c6a5094..27e15ebd700d23 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm
@@ -74,7 +74,7 @@ @interface MTRDeviceControllerFactory ()
 
 @property (atomic, readonly) dispatch_queue_t chipWorkQueue;
 @property (readonly) DeviceControllerFactory * controllerFactory;
-@property (readonly) MTRPersistentStorageDelegateBridge * persistentStorageDelegateBridge;
+@property (readonly) PersistentStorageDelegate * persistentStorageDelegate;
 @property (readonly) MTRAttestationTrustStoreBridge * attestationTrustStoreBridge;
 @property (readonly) MTROTAProviderDelegateBridge * otaProviderDelegateBridge;
 @property (readonly) Crypto::RawKeySessionKeystore * sessionKeystore;
@@ -273,9 +273,9 @@ - (void)cleanupStartupObjects
         _opCertStore = nullptr;
     }
 
-    if (_persistentStorageDelegateBridge) {
-        delete _persistentStorageDelegateBridge;
-        _persistentStorageDelegateBridge = nullptr;
+    if (_persistentStorageDelegate) {
+        delete _persistentStorageDelegate;
+        _persistentStorageDelegate = nullptr;
     }
 }
 
@@ -291,7 +291,7 @@ - (void)cleanupStartupObjects
     __block BOOL listFilled = NO;
     auto fillListBlock = ^{
         FabricTable fabricTable;
-        CHIP_ERROR err = fabricTable.Init({ .storage = self->_persistentStorageDelegateBridge,
+        CHIP_ERROR err = fabricTable.Init({ .storage = self->_persistentStorageDelegate,
             .operationalKeystore = self->_keystore,
             .opCertStore = self->_opCertStore });
         if (err != CHIP_NO_ERROR) {
@@ -348,8 +348,8 @@ - (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams
 
         [MTRControllerAccessControl init];
 
-        _persistentStorageDelegateBridge = new MTRPersistentStorageDelegateBridge(startupParams.storage);
-        if (_persistentStorageDelegateBridge == nil) {
+        _persistentStorageDelegate = new MTRPersistentStorageDelegateBridge(startupParams.storage);
+        if (_persistentStorageDelegate == nil) {
             MTR_LOG_ERROR("Error: %@", kErrorPersistentStorageInit);
             errorCode = CHIP_ERROR_NO_MEMORY;
             return;
@@ -415,7 +415,7 @@ - (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams
             return;
         }
 
-        errorCode = _keystore->Init(_persistentStorageDelegateBridge);
+        errorCode = _keystore->Init(_persistentStorageDelegate);
         if (errorCode != CHIP_NO_ERROR) {
             MTR_LOG_ERROR("Error: %@", kErrorKeystoreInit);
             return;
@@ -429,7 +429,7 @@ - (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams
             return;
         }
 
-        errorCode = _opCertStore->Init(_persistentStorageDelegateBridge);
+        errorCode = _opCertStore->Init(_persistentStorageDelegate);
         if (errorCode != CHIP_NO_ERROR) {
             MTR_LOG_ERROR("Error: %@", kErrorCertStoreInit);
             return;
@@ -482,7 +482,7 @@ - (BOOL)startControllerFactory:(MTRDeviceControllerFactoryParams *)startupParams
 
         params.groupDataProvider = _groupDataProvider;
         params.sessionKeystore = _sessionKeystore;
-        params.fabricIndependentStorage = _persistentStorageDelegateBridge;
+        params.fabricIndependentStorage = _persistentStorageDelegate;
         params.operationalKeystore = _keystore;
         params.opCertStore = _opCertStore;
         params.certificateValidityPolicy = _certificateValidityPolicy;
@@ -788,7 +788,7 @@ - (BOOL)findMatchingFabric:(FabricTable &)fabricTable
     assertChipStackLockedByCurrentThread();
 
     CHIP_ERROR err = fabricTable.Init(
-        { .storage = _persistentStorageDelegateBridge, .operationalKeystore = _keystore, .opCertStore = _opCertStore });
+        { .storage = _persistentStorageDelegate, .operationalKeystore = _keystore, .opCertStore = _opCertStore });
     if (err != CHIP_NO_ERROR) {
         MTR_LOG_ERROR("Can't initialize fabric table: %s", ErrorStr(err));
         return NO;
@@ -937,9 +937,9 @@ - (void)operationalInstanceAdded:(chip::PeerId &)operationalID
     }
 }
 
-- (MTRPersistentStorageDelegateBridge *)storageDelegateBridge
+- (PersistentStorageDelegate *)storageDelegate
 {
-    return _persistentStorageDelegateBridge;
+    return _persistentStorageDelegate;
 }
 
 - (Credentials::GroupDataProvider *)groupData
diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h
index 91b5813c896fb8..9903eaa77e2cd2 100644
--- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h
+++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h
@@ -23,11 +23,10 @@
 
 #import "MTRDeviceControllerFactory.h"
 
+#include <lib/core/CHIPPersistentStorageDelegate.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/core/PeerId.h>
 
-class MTRPersistentStorageDelegateBridge;
-
 namespace chip {
 namespace Credentials {
     class GroupDataProvider;
@@ -54,7 +53,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)operationalInstanceAdded:(chip::PeerId &)operationalID;
 
-@property (readonly) MTRPersistentStorageDelegateBridge * storageDelegateBridge;
+@property (readonly) chip::PersistentStorageDelegate * storageDelegate;
 @property (readonly) chip::Credentials::GroupDataProvider * groupData;
 @property (readonly) chip::Credentials::DeviceAttestationVerifier * deviceAttestationVerifier;
 @end