Address review comment.

project-chip · Nov 16, 2022 · e30de8c · e30de8c
1 parent beccbdf
commit e30de8c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
@@ -541,8 +541,8 @@ void CommissioningWindowManager::UpdateWindowStatus(CommissioningWindowStatus aN
     mWindowStatus                              = aNewStatus;
     if (CommissioningWindowStatusForCluster() != oldClusterStatus)
     {
-        // The Administrator Commissioning cluster is always on endpoint 0.
-        MatterReportingAttributeChangeCallback(0, AdministratorCommissioning::Id,
+        // The Administrator Commissioning cluster is always on the root endpoint.
+        MatterReportingAttributeChangeCallback(kRootEndpointId, AdministratorCommissioning::Id,
                                                AdministratorCommissioning::Attributes::WindowStatus::Id);
     }
 }
@@ -555,17 +555,17 @@ void CommissioningWindowManager::UpdateOpenerVendorId(Nullable<VendorId> aNewOpe
 
     if (mOpenerVendorId != aNewOpenerVendorId)
     {
-        // The Administrator Commissioning cluster is always on endpoint 0.
-        MatterReportingAttributeChangeCallback(0, AdministratorCommissioning::Id,
+        // The Administrator Commissioning cluster is always on the root endpoint.
+        MatterReportingAttributeChangeCallback(kRootEndpointId, AdministratorCommissioning::Id,
                                                AdministratorCommissioning::Attributes::AdminVendorId::Id);
     }
 
     mOpenerVendorId = aNewOpenerVendorId;
 
     if (CommissioningWindowStatusForCluster() != oldClusterStatus)
     {
-        // The Administrator Commissioning cluster is always on endpoint 0.
-        MatterReportingAttributeChangeCallback(0, AdministratorCommissioning::Id,
+        // The Administrator Commissioning cluster is always on the root endpoint.
+        MatterReportingAttributeChangeCallback(kRootEndpointId, AdministratorCommissioning::Id,
                                                AdministratorCommissioning::Attributes::WindowStatus::Id);
     }
 }
@@ -574,8 +574,8 @@ void CommissioningWindowManager::UpdateOpenerFabricIndex(Nullable<FabricIndex> a
 {
     if (mOpenerFabricIndex != aNewOpenerFabricIndex)
     {
-        // The Administrator Commissioning cluster is always on endpoint 0.
-        MatterReportingAttributeChangeCallback(0, AdministratorCommissioning::Id,
+        // The Administrator Commissioning cluster is always on the root endpoint.
+        MatterReportingAttributeChangeCallback(kRootEndpointId, AdministratorCommissioning::Id,
                                                AdministratorCommissioning::Attributes::AdminFabricIndex::Id);
     }
 

diff --git a/src/app/tests/TestCommissionManager.cpp b/src/app/tests/TestCommissionManager.cpp
@@ -55,7 +55,7 @@ void MatterReportingAttributeChangeCallback(chip::EndpointId endpoint, chip::Clu
 {
     using namespace chip::app::Clusters;
     using namespace chip::app::Clusters::AdministratorCommissioning::Attributes;
-    if (endpoint != 0 || clusterId != AdministratorCommissioning::Id)
+    if (endpoint != chip::kRootEndpointId || clusterId != AdministratorCommissioning::Id)
     {
         return;
     }