Remove the MTR_PER_CONTROLLER_STORAGE_ENABLED define.

This is now enabled unconditionally.  Also allows us to remove the wrapper
headers we had to allow us to use the per-controller storage bits internally.

Author: bzbarsky-apple

.github/workflows/darwin.yaml

@@ -75,9 +75,6 @@ jobs:
                 options: # We don't need a full matrix
                     - flavor: asan
                       arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
-                    - flavor: asan-global-storage
-                      arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
-                      defines: MTR_PER_CONTROLLER_STORAGE_ENABLED=0
                     - flavor: tsan
                       arguments: -enableThreadSanitizer YES
         steps:

src/darwin/Framework/CHIP/MTRDefines.h

@@ -102,10 +102,6 @@
 #define MTR_UNSTABLE_API _MTR_UNAVAILABLE
 #endif
 
-#ifndef MTR_PER_CONTROLLER_STORAGE_ENABLED
-#define MTR_PER_CONTROLLER_STORAGE_ENABLED 1
-#endif
-
 #pragma mark - Types
 
 typedef NSData * MTRTLVBytes;

src/darwin/Framework/CHIP/MTRDeviceController.h

@@ -24,9 +24,7 @@
 @class MTRBaseDevice;
 @class MTRServerEndpoint; // Defined in MTRServerEndpoint.h, which imports MTRAccessGrant.h, which imports MTRBaseClusters.h, which imports this file, so we can't import it.
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 @class MTRDeviceControllerAbstractParameters;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -49,7 +47,6 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 /**
  * Initialize a device controller with the provided parameters.  This will:
  *
@@ -62,19 +59,16 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  */
 - (nullable instancetype)initWithParameters:(MTRDeviceControllerAbstractParameters *)parameters
                                       error:(NSError * __autoreleasing *)error MTR_NEWLY_AVAILABLE;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 /**
  * If true, the controller has not been shut down yet.
  */
 @property (readonly, nonatomic, getter=isRunning) BOOL running;
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 /**
  * The ID assigned to this controller at creation time.
  */
 @property (readonly, nonatomic) NSUUID * uniqueIdentifier MTR_NEWLY_AVAILABLE;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 /**
  * Return the Node ID assigned to the controller.  Will return nil if the

src/darwin/Framework/CHIP/MTRDeviceController.mm

@@ -15,12 +15,7 @@
  *    limitations under the License.
  */
 #import <Matter/MTRDefines.h>
-
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerParameters.h>
-#else
-#import "MTRDeviceControllerParameters_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 #import "MTRDeviceController_Internal.h"
 
@@ -169,19 +164,16 @@ - (instancetype)initWithFactory:(MTRDeviceControllerFactory *)factory
             }
 
             id<MTRDeviceControllerStorageDelegate> storageDelegateToUse = storageDelegate;
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
             if (MTRDeviceControllerLocalTestStorage.localTestStorageEnabled) {
                 storageDelegateToUse = [[MTRDeviceControllerLocalTestStorage alloc] initWithPassThroughStorage:storageDelegate];
             }
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
             _controllerDataStore = [[MTRDeviceControllerDataStore alloc] initWithController:self
                                                                             storageDelegate:storageDelegateToUse
                                                                        storageDelegateQueue:storageDelegateQueue];
             if (_controllerDataStore == nil) {
                 return nil;
             }
         } else {
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
             if (MTRDeviceControllerLocalTestStorage.localTestStorageEnabled) {
                 dispatch_queue_t localTestStorageQueue = dispatch_queue_create("org.csa-iot.matter.framework.devicecontroller.localteststorage", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
                 MTRDeviceControllerLocalTestStorage * localTestStorage = [[MTRDeviceControllerLocalTestStorage alloc] initWithPassThroughStorage:nil];
@@ -192,7 +184,6 @@ - (instancetype)initWithFactory:(MTRDeviceControllerFactory *)factory
                     return nil;
                 }
             }
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
         }
 
         // Ensure the otaProviderDelegate, if any, is valid.

src/darwin/Framework/CHIP/MTRDeviceControllerDataStore.h

@@ -17,12 +17,8 @@
 #import <Foundation/Foundation.h>
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceController.h>
-#import <Matter/MTRDevice_Internal.h>
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerStorageDelegate.h>
-#else
-#import "MTRDeviceControllerStorageDelegate_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
+#import <Matter/MTRDevice_Internal.h>
 
 #include <lib/core/CHIPError.h>
 

src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm

@@ -19,13 +19,8 @@
 
 #import <Matter/MTRDefines.h>
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-#import <Matter/MTRDeviceControllerParameters.h>
-#else
-#import "MTRDeviceControllerParameters_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 #import <Matter/MTRClusterConstants.h>
+#import <Matter/MTRDeviceControllerParameters.h>
 #import <Matter/MTRServerCluster.h>
 
 #import "MTRCertificates.h"

src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h

@@ -24,15 +24,10 @@
 #import <Matter/MTRBaseDevice.h> // for MTRClusterPath
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceController.h>
+#import <Matter/MTRDeviceControllerParameters.h>
 #import <Matter/MTRDiagnosticLogsType.h>
 #import <Matter/MTRServerEndpoint.h>
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-#import <Matter/MTRDeviceControllerParameters.h>
-#else
-#import "MTRDeviceControllerParameters_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 #import "MTRDeviceControllerFactory.h"
 
 #include <lib/core/CHIPPersistentStorageDelegate.h>

src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.h

@@ -18,8 +18,6 @@
 #import <Foundation/Foundation.h>
 #import <Matter/Matter.h>
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 NS_ASSUME_NONNULL_BEGIN
 
 MTR_EXTERN MTR_EXPORT @interface MTRDeviceControllerLocalTestStorage : NSObject<MTRDeviceControllerStorageDelegate>
@@ -33,5 +31,3 @@ MTR_EXTERN MTR_EXPORT @interface MTRDeviceControllerLocalTestStorage : NSObject<
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED

src/darwin/Framework/CHIP/MTRDeviceControllerLocalTestStorage.mm

@@ -18,8 +18,6 @@
 #import "MTRDeviceControllerLocalTestStorage.h"
 #import "MTRLogging_Internal.h"
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 static NSString * const kLocalTestUserDefaultDomain = @"org.csa-iot.matter.darwintest";
 static NSString * const kLocalTestUserDefaultEnabledKey = @"enableTestStorage";
 
@@ -115,5 +113,3 @@ - (BOOL)controller:(MTRDeviceController *)controller
     }
 }
 @end
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED

src/darwin/Framework/CHIP/MTRDeviceControllerParameters.h

@@ -16,12 +16,6 @@
 
 #import <Matter/MTRDefines.h>
 
-#if defined(MTR_INTERNAL_INCLUDE) && defined(MTR_INCLUDED_FROM_UMBRELLA_HEADER)
-#error Internal includes should not happen from the umbrella header
-#endif
-
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED || defined(MTR_INTERNAL_INCLUDE)
-
 #import <Matter/MTRDeviceControllerStorageDelegate.h>
 #import <Matter/MTROTAProviderDelegate.h>
 
@@ -32,9 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
  * interfaces inheriting from this one should be used to actually do the
  * initialization.
  */
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_NEWLY_AVAILABLE
-#endif
 @interface MTRDeviceControllerAbstractParameters : NSObject
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
@@ -44,9 +36,7 @@ MTR_NEWLY_AVAILABLE
  * Parameters that can be used to initialize an MTRDeviceController which
  * has a node identity.
  */
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_NEWLY_AVAILABLE
-#endif
 @interface MTRDeviceControllerParameters : MTRDeviceControllerAbstractParameters
 
 /**
@@ -89,9 +79,7 @@ MTR_NEWLY_AVAILABLE
 
 @end
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_NEWLY_AVAILABLE
-#endif
 @interface MTRDeviceControllerExternalCertificateParameters : MTRDeviceControllerParameters
 
 - (instancetype)init NS_UNAVAILABLE;
@@ -142,5 +130,3 @@ MTR_NEWLY_AVAILABLE
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED || defined(MTR_INTERNAL_INCLUDE)

src/darwin/Framework/CHIP/MTRDeviceControllerParameters_Wrapper.h

@@ -23,11 +23,7 @@
 #import "MTRP256KeypairBridge.h"
 #import "NSDataSpanConversion.h"
 
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerStorageDelegate.h>
-#else
-#import "MTRDeviceControllerStorageDelegate_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 #include <controller/OperationalCredentialsDelegate.h>
 #include <credentials/CHIPCert.h>

src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams.mm

@@ -20,11 +20,7 @@
 #import <Foundation/Foundation.h>
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceController.h>
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerParameters.h>
-#else
-#import "MTRDeviceControllerParameters_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
 
 #include <crypto/CHIPCryptoPAL.h>
 #include <lib/core/DataModelTypes.h>

src/darwin/Framework/CHIP/MTRDeviceControllerStartupParams_Internal.h

@@ -18,12 +18,6 @@
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceController.h>
 
-#if defined(MTR_INTERNAL_INCLUDE) && defined(MTR_INCLUDED_FROM_UMBRELLA_HEADER)
-#error Internal includes should not happen from the umbrella header
-#endif
-
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED || defined(MTR_INTERNAL_INCLUDE)
-
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSUInteger, MTRStorageSecurityLevel) {
@@ -67,9 +61,7 @@ typedef NS_ENUM(NSUInteger, MTRStorageSharingType) {
  *    stored and calling MTRDeviceControllerStorageClasses(), is likely to lead
  *    to deadlocks.
  */
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_NEWLY_AVAILABLE
-#endif
 @protocol MTRDeviceControllerStorageDelegate <NSObject>
 @required
 /**
@@ -113,13 +105,8 @@ MTR_NEWLY_AVAILABLE
           sharingType:(MTRStorageSharingType)sharingType;
 @end
 
-// TODO: FIXME: Is this a sane place to put this API?
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 MTR_EXTERN MTR_NEWLY_AVAILABLE
-#endif
     NSSet<Class> *
     MTRDeviceControllerStorageClasses(void);
 
 NS_ASSUME_NONNULL_END
-
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED || defined(MTR_INTERNAL_INCLUDE)

src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate.h

@@ -35,12 +35,8 @@
 
 #import <Matter/MTRDefines.h>
 #import <Matter/MTRDeviceControllerStartupParams.h>
-#import <Matter/MTRDiagnosticLogsType.h>
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
 #import <Matter/MTRDeviceControllerStorageDelegate.h>
-#else
-#import "MTRDeviceControllerStorageDelegate_Wrapper.h"
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
+#import <Matter/MTRDiagnosticLogsType.h>
 #import <Matter/MTROTAProviderDelegate.h>
 
 @class MTRDeviceControllerStartupParamsInternal;
@@ -59,13 +55,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MTRDeviceController ()
 
-#if !MTR_PER_CONTROLLER_STORAGE_ENABLED
-/**
- * The ID assigned to this controller at creation time.
- */
-@property (readonly, nonatomic) NSUUID * uniqueIdentifier;
-#endif // MTR_PER_CONTROLLER_STORAGE_ENABLED
-
 #pragma mark - MTRDeviceControllerFactory methods
 
 /**

src/darwin/Framework/CHIP/MTRDeviceControllerStorageDelegate_Wrapper.h

@@ -173,12 +173,8 @@ - (BOOL)associateWithController:(nullable MTRDeviceController *)controller
 
     MTRDeviceController * existingController = _deviceController;
     if (existingController != nil) {
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
         MTR_LOG_ERROR("Cannot associate MTRServerAttribute with controller %@; already associated with controller %@",
             controller.uniqueIdentifier, existingController.uniqueIdentifier);
-#else
-        MTR_LOG_ERROR("Cannot associate MTRServerAttribute with controller; already associated with a different controller");
-#endif
         return NO;
     }
 

src/darwin/Framework/CHIP/MTRDeviceController_Internal.h

@@ -250,12 +250,8 @@ - (BOOL)associateWithController:(nullable MTRDeviceController *)controller
 
     MTRDeviceController * existingController = _deviceController;
     if (existingController != nil) {
-#if MTR_PER_CONTROLLER_STORAGE_ENABLED
         MTR_LOG_ERROR("Cannot associate MTRServerCluster with controller %@; already associated with controller %@",
             controller.uniqueIdentifier, existingController.uniqueIdentifier);
-#else
-        MTR_LOG_ERROR("Cannot associate MTRServerCluster with controller; already associated with a different controller");
-#endif
         return NO;
     }