From e30de8ce278b76a0112c79c10e42202096e5d69b Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 16 Nov 2022 08:45:07 -0500 Subject: [PATCH] Address review comment. --- src/app/server/CommissioningWindowManager.cpp | 16 ++++++++-------- src/app/tests/TestCommissionManager.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp index d8bf5568be9826..949b46020373b2 100644 --- 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,8 +555,8 @@ void CommissioningWindowManager::UpdateOpenerVendorId(Nullable 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); } @@ -564,8 +564,8 @@ void CommissioningWindowManager::UpdateOpenerVendorId(Nullable aNewOpe 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 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 index 4c1744b69a7e8f..7a05cbdeea7d4b 100644 --- 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; }