Merge pull request #5 from bzbarsky-apple/testing

Fix darwin tests

src/controller/CHIPDeviceController.cpp

@@ -152,11 +152,18 @@ CHIP_ERROR DeviceController::InitControllerNOCChain(const ControllerInitParams &
     Credentials::P256PublicKeySpan rootPublicKey;
     FabricId fabricId;
 
+    // There are three possibilities here in terms of what happens with our
+    // operational key:
+    // 1) We have an externally owned operational keypair.
+    // 2) We have an operational keypair that the fabric table should clone via
+    //    serialize/deserialize.
+    // 3) We have no keypair at all, and the fabric table has been initialized
+    //    with a key store.
     if (params.hasExternallyOwnedOperationalKeypair)
     {
         ReturnErrorOnFailure(newFabric.SetExternallyOwnedOperationalKeypair(params.operationalKeypair));
     }
-    else
+    else if (params.operationalKeypair)
     {
         ReturnErrorOnFailure(newFabric.SetOperationalKeypair(params.operationalKeypair));
     }

src/credentials/FabricTable.h

@@ -494,9 +494,7 @@ class DLL_EXPORT FabricTable
 
     // Currently only operational key is managed by this API.
     /**
-     * @brief
-     *
-     * If nothing is pending to commit, returns CHIP_NO_ERROR right away.
+     * @brief If nothing is pending to commit, returns CHIP_NO_ERROR right away.
      *
      * @return CHIP_ERROR
      */

src/darwin/Framework/CHIP/MatterControllerFactory.mm

@@ -237,6 +237,7 @@ - (BOOL)startup:(MatterControllerFactoryParams *)startupParams
 
         params.groupDataProvider = _groupDataProvider;
         params.fabricIndependentStorage = _persistentStorageDelegateBridge;
+        params.operationalKeystore = _keystore;
         errorCode = _controllerFactory->Init(params);
         if (errorCode != CHIP_NO_ERROR) {
             CHIP_LOG_ERROR("Error: %@", kErrorControllerFactoryInit);