Skip to content

Commit 3736d56

Browse files
gmarcosbgmarcosb
authored
Merge branch 'project-chip:master' into camera-webrtc-provider
2 parents f7da53c + cbacbe3 commit 3736d56

14 files changed

+0
-189
lines changed

‎config/esp32/components/chip/CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,6 @@ if (CONFIG_ENABLE_ESP_INSIGHTS_TRACE)
321321
target_include_directories(${COMPONENT_LIB} INTERFACE "${CHIP_ROOT}/src/tracing/esp32_trace/include")
322322
endif()
323323

324-
if (CONFIG_ENABLE_MATTER_EVENT_LIST)
325-
chip_gn_arg_append ("enable_eventlist_attribute" "true")
326-
endif()
327-
328324
set(args_gn_input "${CMAKE_CURRENT_BINARY_DIR}/args.gn.in")
329325
file(GENERATE OUTPUT "${args_gn_input}" CONTENT "${chip_gn_args}")
330326

‎config/esp32/components/chip/Kconfig

-9
Original file line numberDiff line numberDiff line change
@@ -1298,15 +1298,6 @@ menu "CHIP Device Layer"
12981298

12991299
endmenu
13001300

1301-
menu "Enable Matter Event List"
1302-
config ENABLE_MATTER_EVENT_LIST
1303-
bool "Enable Matter support Event List attribute"
1304-
default n
1305-
help
1306-
Enable Matter support Event List attribute.
1307-
1308-
endmenu
1309-
13101301
menu "Enable BLE Extended Announcement"
13111302
config ENABLE_BLE_EXT_ANNOUNCEMENT
13121303
bool "Enable BLE Extended Announcement"

‎config/nxp/cmake/common.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ matter_add_gn_arg_bool ("chip_enable_wifi" CONFIG_CHIP_WI
4747
matter_add_gn_arg_bool ("chip_enable_ethernet" CONFIG_CHIP_ETHERNET)
4848
matter_add_gn_arg_bool ("chip_system_config_provide_statistics" CONFIG_CHIP_STATISTICS)
4949
matter_add_gn_arg_bool ("chip_enable_icd_server" CONFIG_CHIP_ENABLE_ICD_SUPPORT)
50-
matter_add_gn_arg_bool ("enable_eventlist_attribute" TRUE)
5150
matter_add_gn_arg_bool ("chip_enable_ota_requestor" CONFIG_CHIP_OTA_REQUESTOR)
5251

5352
if(CONFIG_DEBUG)

‎src/app/AttributePathExpandIterator-DataModel.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ bool AttributePathExpandIteratorDataModel::IsValidAttributeId(AttributeId attrib
4242
{
4343
case Clusters::Globals::Attributes::GeneratedCommandList::Id:
4444
case Clusters::Globals::Attributes::AcceptedCommandList::Id:
45-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
46-
case Clusters::Globals::Attributes::EventList::Id:
47-
#endif // CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
4845
case Clusters::Globals::Attributes::AttributeList::Id:
4946
return true;
5047
default:

‎src/app/BUILD.gn

-3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ declare_args() {
4141
# By default, the resources used by each fabric is unlimited if they are allocated on heap. This flag is for checking the resource usage even when they are allocated on heap to increase code coverage in integration tests.
4242
chip_im_force_fabric_quota_check = false
4343

44-
enable_eventlist_attribute = false
45-
4644
# Allow building ota-requestor-app with a non-spec-compliant floor
4745
# (i.e. smaller than 2 minutes) for action delays.
4846
non_spec_compliant_ota_action_delay_floor = -1
@@ -71,7 +69,6 @@ buildconfig_header("app_buildconfig") {
7169
"CHIP_CONFIG_ACCESS_CONTROL_POLICY_LOGGING_VERBOSITY=${chip_access_control_policy_logging_verbosity}",
7270
"CHIP_CONFIG_PERSIST_SUBSCRIPTIONS=${chip_persist_subscriptions}",
7371
"CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION=${chip_subscription_timeout_resumption}",
74-
"CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE=${enable_eventlist_attribute}",
7572
"CHIP_CONFIG_ENABLE_READ_CLIENT=${chip_enable_read_client}",
7673
"CHIP_CONFIG_STATIC_GLOBAL_INTERACTION_MODEL_ENGINE=${chip_im_static_global_interaction_model_engine}",
7774
"TIME_SYNC_ENABLE_TSC_FEATURE=${time_sync_enable_tsc_feature}",

‎src/app/GlobalAttributes.h

-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ namespace app {
3232
constexpr AttributeId GlobalAttributesNotInMetadata[] = {
3333
Clusters::Globals::Attributes::GeneratedCommandList::Id,
3434
Clusters::Globals::Attributes::AcceptedCommandList::Id,
35-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
36-
Clusters::Globals::Attributes::EventList::Id,
37-
#endif // CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
3835
Clusters::Globals::Attributes::AttributeList::Id,
3936
};
4037

‎src/app/ember_coupling/EventPathValidity.mixin.h

-51
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,6 @@ namespace chip {
2222
namespace app {
2323
namespace {
2424

25-
/**
26-
* Find out if the given EventId is reported as supported by the given cluster
27-
* within its metadata. If cluster has no event metadata (i.e. no event list
28-
* support is available), clusters are assumed to support any event as there is
29-
* no way to actually tell.
30-
*
31-
* This function is functionally similar to `CheckEventSupportStatus` however
32-
* it avoids extra lookups to find the underlying cluster (cluster is already
33-
* passed into the method).
34-
*/
35-
bool ClusterSupportsEvent(const EmberAfCluster * cluster, EventId eventId)
36-
{
37-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
38-
for (size_t i = 0; i < cluster->eventCount; ++i)
39-
{
40-
if (cluster->eventList[i] == eventId)
41-
{
42-
return true;
43-
}
44-
}
45-
46-
return false;
47-
#else
48-
// No way to tell. Just claim supported.
49-
return true;
50-
#endif // CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
51-
}
52-
53-
#if !CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
5425
static bool CanAccessEvent(const Access::SubjectDescriptor & aSubjectDescriptor, const ConcreteClusterPath & aPath,
5526
Access::Privilege aNeededPrivilege)
5627
{
@@ -61,7 +32,6 @@ static bool CanAccessEvent(const Access::SubjectDescriptor & aSubjectDescriptor,
6132
CHIP_ERROR err = Access::GetAccessControl().Check(aSubjectDescriptor, requestPath, aNeededPrivilege);
6233
return (err == CHIP_NO_ERROR);
6334
}
64-
#endif
6535

6636
static bool CanAccessEvent(const Access::SubjectDescriptor & aSubjectDescriptor, const ConcreteEventPath & aPath)
6737
{
@@ -82,31 +52,10 @@ static bool HasValidEventPathForEndpointAndCluster(EndpointId aEndpoint, const E
8252
{
8353
if (aEventPath.HasWildcardEventId())
8454
{
85-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
86-
for (decltype(aCluster->eventCount) idx = 0; idx < aCluster->eventCount; ++idx)
87-
{
88-
ConcreteEventPath path(aEndpoint, aCluster->clusterId, aCluster->eventList[idx]);
89-
// If we get here, the path exists. We just have to do an ACL check for it.
90-
bool isValid = CanAccessEvent(aSubjectDescriptor, path);
91-
if (isValid)
92-
{
93-
return true;
94-
}
95-
}
96-
97-
return false;
98-
#else
9955
// We have no way to expand wildcards. Just assume that we would need
10056
// View permissions for whatever events are involved.
10157
ConcreteClusterPath clusterPath(aEndpoint, aCluster->clusterId);
10258
return CanAccessEvent(aSubjectDescriptor, clusterPath, Access::Privilege::kView);
103-
#endif
104-
}
105-
106-
if (!ClusterSupportsEvent(aCluster, aEventPath.mEventId))
107-
{
108-
// Not an existing event path.
109-
return false;
11059
}
11160

11261
ConcreteEventPath path(aEndpoint, aCluster->clusterId, aEventPath.mEventId);

‎src/app/tests/TestAttributePathExpandIterator.cpp

-60
Original file line numberDiff line numberDiff line change
@@ -50,36 +50,24 @@ TEST(TestAttributePathExpandIterator, TestAllWildcard)
5050
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
5151
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
5252
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
53-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
54-
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
55-
#endif
5653
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
5754
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
5855
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
5956
{ kMockEndpoint1, MockClusterId(2), MockAttributeId(1) },
6057
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
6158
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
62-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
63-
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
64-
#endif
6559
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
6660
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
6761
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
6862
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
6963
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
70-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
71-
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
72-
#endif
7364
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
7465
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
7566
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
7667
{ kMockEndpoint2, MockClusterId(2), MockAttributeId(1) },
7768
{ kMockEndpoint2, MockClusterId(2), MockAttributeId(2) },
7869
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
7970
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
80-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
81-
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
82-
#endif
8371
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
8472
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id },
8573
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id },
@@ -88,18 +76,12 @@ TEST(TestAttributePathExpandIterator, TestAllWildcard)
8876
{ kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
8977
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
9078
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
91-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
92-
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
93-
#endif
9479
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
9580
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
9681
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
9782
{ kMockEndpoint3, MockClusterId(1), MockAttributeId(1) },
9883
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
9984
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
100-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
101-
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
102-
#endif
10385
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
10486
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
10587
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
@@ -109,25 +91,16 @@ TEST(TestAttributePathExpandIterator, TestAllWildcard)
10991
{ kMockEndpoint3, MockClusterId(2), MockAttributeId(4) },
11092
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
11193
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
112-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
113-
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
114-
#endif
11594
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
11695
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id },
11796
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id },
11897
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
11998
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
120-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
121-
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
122-
#endif
12399
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
124100
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::ClusterRevision::Id },
125101
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::FeatureMap::Id },
126102
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::GeneratedCommandList::Id },
127103
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AcceptedCommandList::Id },
128-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
129-
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::EventList::Id },
130-
#endif
131104
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AttributeList::Id },
132105
};
133106

@@ -237,9 +210,6 @@ TEST(TestAttributePathExpandIterator, TestWildcardAttribute)
237210
{ kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
238211
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
239212
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
240-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
241-
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
242-
#endif
243213
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
244214
};
245215

@@ -314,36 +284,24 @@ TEST(TestAttributePathExpandIterator, TestMultipleClusInfo)
314284
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
315285
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
316286
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
317-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
318-
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
319-
#endif
320287
{ kMockEndpoint1, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
321288
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
322289
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
323290
{ kMockEndpoint1, MockClusterId(2), MockAttributeId(1) },
324291
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
325292
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
326-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
327-
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
328-
#endif
329293
{ kMockEndpoint1, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
330294
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
331295
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
332296
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
333297
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
334-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
335-
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
336-
#endif
337298
{ kMockEndpoint2, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
338299
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
339300
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
340301
{ kMockEndpoint2, MockClusterId(2), MockAttributeId(1) },
341302
{ kMockEndpoint2, MockClusterId(2), MockAttributeId(2) },
342303
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
343304
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
344-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
345-
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
346-
#endif
347305
{ kMockEndpoint2, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
348306
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id },
349307
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id },
@@ -352,18 +310,12 @@ TEST(TestAttributePathExpandIterator, TestMultipleClusInfo)
352310
{ kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
353311
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
354312
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
355-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
356-
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
357-
#endif
358313
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
359314
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
360315
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::FeatureMap::Id },
361316
{ kMockEndpoint3, MockClusterId(1), MockAttributeId(1) },
362317
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::GeneratedCommandList::Id },
363318
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AcceptedCommandList::Id },
364-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
365-
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::EventList::Id },
366-
#endif
367319
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::AttributeList::Id },
368320
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::ClusterRevision::Id },
369321
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::FeatureMap::Id },
@@ -373,25 +325,16 @@ TEST(TestAttributePathExpandIterator, TestMultipleClusInfo)
373325
{ kMockEndpoint3, MockClusterId(2), MockAttributeId(4) },
374326
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::GeneratedCommandList::Id },
375327
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AcceptedCommandList::Id },
376-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
377-
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::EventList::Id },
378-
#endif
379328
{ kMockEndpoint3, MockClusterId(2), Clusters::Globals::Attributes::AttributeList::Id },
380329
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::ClusterRevision::Id },
381330
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::FeatureMap::Id },
382331
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
383332
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
384-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
385-
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
386-
#endif
387333
{ kMockEndpoint3, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
388334
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::ClusterRevision::Id },
389335
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::FeatureMap::Id },
390336
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::GeneratedCommandList::Id },
391337
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AcceptedCommandList::Id },
392-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
393-
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::EventList::Id },
394-
#endif
395338
{ kMockEndpoint3, MockClusterId(4), Clusters::Globals::Attributes::AttributeList::Id },
396339
{ kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
397340
{ kMockEndpoint3, MockClusterId(1), Clusters::Globals::Attributes::ClusterRevision::Id },
@@ -405,9 +348,6 @@ TEST(TestAttributePathExpandIterator, TestMultipleClusInfo)
405348
{ kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
406349
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::GeneratedCommandList::Id },
407350
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AcceptedCommandList::Id },
408-
#if CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE
409-
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::EventList::Id },
410-
#endif
411351
{ kMockEndpoint2, MockClusterId(3), Clusters::Globals::Attributes::AttributeList::Id },
412352
{ kMockEndpoint2, MockClusterId(3), MockAttributeId(3) },
413353
};

0 commit comments

Comments
 (0)