Remove the storage delegate's queue from the storage bridge

src/darwin/CHIPTool/CHIPTool/Framework Helpers/DefaultsUtils.m

@@ -65,14 +65,12 @@ void CHIPSetNextAvailableDeviceID(uint64_t id)
 
 CHIPDeviceController * InitializeCHIP(void)
 {
-    static dispatch_queue_t callbackQueue;
     static CHIPToolPersistentStorageDelegate * storage = nil;
     static dispatch_once_t onceToken;
     CHIPDeviceController * controller = [CHIPDeviceController sharedController];
     dispatch_once(&onceToken, ^{
         storage = [[CHIPToolPersistentStorageDelegate alloc] init];
-        callbackQueue = dispatch_queue_create("com.chip.persistentstorage.callback", DISPATCH_QUEUE_SERIAL);
-        [controller startup:storage queue:callbackQueue];
+        [controller startup:storage];
     });
 
     return controller;

src/darwin/Framework/CHIP/CHIPDeviceController.h

@@ -89,10 +89,8 @@ NS_ASSUME_NONNULL_BEGIN
  * check if the stack needs to be started up.
  *
  * @param[in] storageDelegate The delegate for persistent storage
- *
- * @param[in] queue The queue on which the storage callbacks will be delivered
  */
-- (BOOL)startup:(_Nullable id<CHIPPersistentStorageDelegate>)storageDelegate queue:(_Nullable dispatch_queue_t)queue;
+- (BOOL)startup:(_Nullable id<CHIPPersistentStorageDelegate>)storageDelegate;
 
 /**
  * Shutdown the CHIP Stack. Repeated calls to shutdown without calls to startup in between are NO-OPs.

src/darwin/Framework/CHIP/CHIPDeviceController.mm

@@ -122,7 +122,7 @@ - (BOOL)shutdown
     return YES;
 }
 
-- (BOOL)startup:(_Nullable id<CHIPPersistentStorageDelegate>)storageDelegate queue:(_Nullable dispatch_queue_t)queue
+- (BOOL)startup:(_Nullable id<CHIPPersistentStorageDelegate>)storageDelegate
 {
     __block BOOL commissionerInitialized = NO;
     dispatch_sync(_chipWorkQueue, ^{
@@ -133,7 +133,7 @@ - (BOOL)startup:(_Nullable id<CHIPPersistentStorageDelegate>)storageDelegate que
 
         CHIP_ERROR errorCode = CHIP_ERROR_INCORRECT_STATE;
 
-        _persistentStorageDelegateBridge->setFrameworkDelegate(storageDelegate, queue);
+        _persistentStorageDelegateBridge->setFrameworkDelegate(storageDelegate);
         // initialize NodeID if needed
         [self _getControllerNodeId];
 

src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.h

@@ -28,7 +28,7 @@ class CHIPPersistentStorageDelegateBridge : public chip::PersistentStorageDelega
     CHIPPersistentStorageDelegateBridge();
     ~CHIPPersistentStorageDelegateBridge();
 
-    void setFrameworkDelegate(_Nullable id<CHIPPersistentStorageDelegate> delegate, _Nullable dispatch_queue_t queue);
+    void setFrameworkDelegate(_Nullable id<CHIPPersistentStorageDelegate> delegate);
 
     CHIP_ERROR SyncGetKeyValue(const char * key, void * buffer, uint16_t & size) override;
 

src/darwin/Framework/CHIP/CHIPPersistentStorageDelegateBridge.mm

@@ -60,16 +60,13 @@
 
 CHIPPersistentStorageDelegateBridge::~CHIPPersistentStorageDelegateBridge(void) {}
 
-void CHIPPersistentStorageDelegateBridge::setFrameworkDelegate(
-    _Nullable id<CHIPPersistentStorageDelegate> delegate, _Nullable dispatch_queue_t queue)
+void CHIPPersistentStorageDelegateBridge::setFrameworkDelegate(_Nullable id<CHIPPersistentStorageDelegate> delegate)
 {
     dispatch_async(mWorkQueue, ^{
-        if (delegate && queue) {
+        if (delegate) {
             mDelegate = delegate;
-            mQueue = queue;
         } else {
             mDelegate = nil;
-            mQueue = nil;
         }
     });
 }
@@ -125,10 +122,8 @@
         NSLog(@"PersistentStorageDelegate Set Key %@", keyString);
 
         id<CHIPPersistentStorageDelegate> strongDelegate = mDelegate;
-        if (strongDelegate && mQueue) {
-            dispatch_sync(mQueue, ^{
-                [strongDelegate CHIPSetKeyValue:keyString value:valueString];
-            });
+        if (strongDelegate) {
+            [strongDelegate CHIPSetKeyValue:keyString value:valueString];
         } else {
             [mDefaultPersistentStorage setObject:valueString forKey:keyString];
         }
@@ -148,10 +143,8 @@
         NSLog(@"PersistentStorageDelegate Delete Key: %@", keyString);
 
         id<CHIPPersistentStorageDelegate> strongDelegate = mDelegate;
-        if (strongDelegate && mQueue) {
-            dispatch_sync(mQueue, ^{
-                [strongDelegate CHIPDeleteKeyValue:keyString];
-            });
+        if (strongDelegate) {
+            [strongDelegate CHIPDeleteKeyValue:keyString];
         } else {
             [mDefaultPersistentStorage removeObjectForKey:keyString];
         }

src/darwin/Framework/CHIPTests/CHIPClustersTests.m

@@ -95,7 +95,7 @@ - (void)testInitStack
     [controller setListenPort:kLocalPort];
     [controller setPairingDelegate:pairing queue:callbackQueue];
 
-    BOOL started = [controller startup:nil queue:nil];
+    BOOL started = [controller startup:nil];
     XCTAssertTrue(started);
 
     NSError * error;