Merge branch 'master' into feature/fix-tv-app-install-flow-and-suppor…

…ted-clusters

scripts/tests/chiptest/yamltest_with_chip_repl_tester.py

@@ -101,7 +101,7 @@ async def execute_test(yaml, runner):
     '--pics-file',
     default=None,
     help='Optional PICS file')
-def main(setup_code, yaml_path, node_id, pics_file):
+async def main(setup_code, yaml_path, node_id, pics_file):
     # Setting up python environment for running YAML CI tests using python parser.
     with tempfile.NamedTemporaryFile() as chip_stack_storage:
         chip.native.Init()
@@ -122,7 +122,7 @@ def main(setup_code, yaml_path, node_id, pics_file):
         # Creating and commissioning to a single controller to match what is currently done when
         # running.
         dev_ctrl = ca_list[0].adminList[0].NewController()
-        dev_ctrl.CommissionWithCode(setup_code, node_id)
+        await dev_ctrl.CommissionWithCode(setup_code, node_id)
 
         def _StackShutDown():
             # Tearing down chip stack. If not done in the correct order test will fail.
@@ -143,7 +143,7 @@ def _StackShutDown():
             runner = ReplTestRunner(
                 clusters_definitions, certificate_authority_manager, dev_ctrl)
 
-            asyncio.run(execute_test(yaml, runner))
+            await execute_test(yaml, runner)
 
         except Exception:
             print(traceback.format_exc())
@@ -153,4 +153,4 @@ def _StackShutDown():
 
 
 if __name__ == '__main__':
-    main()
+    asyncio.run(main())

src/app/ClusterStateCache.h

@@ -102,8 +102,6 @@ class ClusterStateCacheT : protected ReadClient::Callback
      * @param [in] callback the derived callback which inherit from ReadClient::Callback
      * @param [in] highestReceivedEventNumber optional highest received event number, if cache receive the events with the number
      *             less than or equal to this value, skip those events
-     * @param [in] cacheData boolean to decide whether this cache would store attribute/event data/status,
-     *             the default is true.
      */
     ClusterStateCacheT(Callback & callback, Optional<EventNumber> highestReceivedEventNumber = Optional<EventNumber>::Missing()) :
         mCallback(callback), mBufferedReader(*this)

src/app/CommandSender.h

@@ -136,7 +136,7 @@ class CommandSender final : public Messaging::ExchangeDelegate
          * The CommandSender object MUST continue to exist after this call is completed. The application shall wait until it
          * receives an OnDone call to destroy the object.
          *
-         * @param[in] apCommandSender The command sender object that initiated the command transaction.
+         * @param[in] commandSender   The command sender object that initiated the command transaction.
          * @param[in] aResponseData   Information pertaining to the response.
          */
         virtual void OnResponse(CommandSender * commandSender, const ResponseData & aResponseData) {}
@@ -149,7 +149,7 @@ class CommandSender final : public Messaging::ExchangeDelegate
          * The CommandSender object MUST continue to exist after this call is completed. The application shall wait until it
          * receives an OnDone call to destroy the object.
          *
-         * @param apCommandSender The CommandSender object that initiated the transaction.
+         * @param commandSender   The CommandSender object that initiated the transaction.
          * @param aNoResponseData Details about the request without a response.
          */
         virtual void OnNoResponse(CommandSender * commandSender, const NoResponseData & aNoResponseData) {}

src/controller/CHIPDeviceController.h

@@ -385,7 +385,7 @@ class DLL_EXPORT DeviceController : public AbstractDnssdDiscoveryController
      * @param[in] noc                                NOC in CHIP certificate format.
      * @param[in] icac                               ICAC in CHIP certificate format. If no icac is present, an empty
      *                                               ByteSpan should be passed.
-     * @param[in] externalOperationalKeypair         External operational keypair. If null, use keypair in OperationalKeystore.
+     * @param[in] operationalKeypair                 External operational keypair. If null, use keypair in OperationalKeystore.
      * @param[in] operationalKeypairExternalOwned    If true, external operational keypair must outlive the fabric.
      *                                               If false, the keypair is copied and owned in heap of a FabricInfo.
      *