Skip to content

Commit dad97c8

Browse files
andy31415restyled-commitsharimau-qirex
authored
Split out Attribute Persistance between safe (can be at libCHIP level) and ember-specific (placed in codegen level) (project-chip#36658)
* Separate out logic between Safe and Ember storage persistence. - keeps persistence and safe persistence as interfaces - implementations are now Separate - let server initialize the default safe persistence - update codegen provider to initialize the ember side * Some manual updates * Scripted update * Restyle * Some manual updates again * More manual updates. Only tests remain (and these are odd now ....) * Update tests and support for nullptr, manual fix for one compilation * Remove ember dependency from server * Fix more typos for compilation * Restyle * Add a note about cadmin 1_19 being slow * Fix up link to PR for persistence * Restyled by prettier-markdown * Mark one more slow test * Add a few more dependencies to make esp32 link * fix data model paths * Fix qpg and nrf compile * Fix a few more tests * Restyled by clang-format * Fix another typo for NRF compile * Add persistence cpp files to darwin project * Fix typo * Drop timeouts for java tests: it is not reasonable to wait 360 minutes for a run to timeout, set individual tests to short * Add back deleted line from before * Restyled by clang-format * Update src/app/DefaultSafeAttributePersistenceProvider.h Co-authored-by: Andy Salisbury <salisbury.andy@gmail.com> --------- Co-authored-by: Restyled.io <commits@restyled.io> Co-authored-by: Andy Salisbury <salisbury.andy@gmail.com>
1 parent 6ee4e23 commit dad97c8

File tree

125 files changed

+653
-412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+653
-412
lines changed

‎.github/workflows/java-tests.yaml

+32
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ jobs:
104104
build \
105105
"
106106
- name: Run Discover Commissionables Test
107+
# Generally completes in seconds
108+
timeout-minutes: 2
107109
run: |
108110
scripts/run_in_python_env.sh out/venv \
109111
'./scripts/tests/run_java_test.py \
@@ -115,6 +117,8 @@ jobs:
115117
--factoryreset \
116118
'
117119
- name: Run Pairing Onnetwork Test
120+
# Generally completes in seconds
121+
timeout-minutes: 2
118122
run: |
119123
scripts/run_in_python_env.sh out/venv \
120124
'./scripts/tests/run_java_test.py \
@@ -126,6 +130,8 @@ jobs:
126130
--factoryreset \
127131
'
128132
- name: Run IM Invoke Test
133+
# Generally completes in seconds
134+
timeout-minutes: 2
129135
run: |
130136
scripts/run_in_python_env.sh out/venv \
131137
'./scripts/tests/run_java_test.py \
@@ -137,6 +143,8 @@ jobs:
137143
--factoryreset \
138144
'
139145
- name: Run IM Extendable Invoke Test
146+
# Generally completes in seconds
147+
timeout-minutes: 2
140148
run: |
141149
scripts/run_in_python_env.sh out/venv \
142150
'./scripts/tests/run_java_test.py \
@@ -148,6 +156,8 @@ jobs:
148156
--factoryreset \
149157
'
150158
- name: Run IM Read Test
159+
# Generally completes in seconds
160+
timeout-minutes: 2
151161
run: |
152162
scripts/run_in_python_env.sh out/venv \
153163
'./scripts/tests/run_java_test.py \
@@ -159,6 +169,8 @@ jobs:
159169
--factoryreset \
160170
'
161171
- name: Run IM Write Test
172+
# Generally completes in seconds
173+
timeout-minutes: 2
162174
run: |
163175
scripts/run_in_python_env.sh out/venv \
164176
'./scripts/tests/run_java_test.py \
@@ -170,6 +182,8 @@ jobs:
170182
--factoryreset \
171183
'
172184
- name: Run IM Subscribe Test
185+
# Generally completes in seconds
186+
timeout-minutes: 2
173187
run: |
174188
scripts/run_in_python_env.sh out/venv \
175189
'./scripts/tests/run_java_test.py \
@@ -181,6 +195,8 @@ jobs:
181195
--factoryreset \
182196
'
183197
- name: Run Pairing AlreadyDiscovered Test
198+
# Generally completes in seconds
199+
timeout-minutes: 2
184200
run: |
185201
scripts/run_in_python_env.sh out/venv \
186202
'./scripts/tests/run_java_test.py \
@@ -205,6 +221,8 @@ jobs:
205221
--factoryreset \
206222
'
207223
- name: Run Pairing SetupQRCode Test
224+
# Generally completes in seconds
225+
timeout-minutes: 2
208226
run: |
209227
scripts/run_in_python_env.sh out/venv \
210228
'./scripts/tests/run_java_test.py \
@@ -216,6 +234,8 @@ jobs:
216234
--factoryreset \
217235
'
218236
- name: Run Pairing ManualCode Test
237+
# Generally completes in seconds
238+
timeout-minutes: 2
219239
run: |
220240
scripts/run_in_python_env.sh out/venv \
221241
'./scripts/tests/run_java_test.py \
@@ -227,6 +247,8 @@ jobs:
227247
--factoryreset \
228248
'
229249
- name: Run Pairing ICD Onnetwork Test
250+
# Generally completes in seconds
251+
timeout-minutes: 2
230252
run: |
231253
scripts/run_in_python_env.sh out/venv \
232254
'./scripts/tests/run_java_test.py \
@@ -252,6 +274,8 @@ jobs:
252274
--factoryreset \
253275
'
254276
- name: Run Pairing Onnetwork Test
277+
# Generally completes in seconds
278+
timeout-minutes: 2
255279
run: |
256280
scripts/run_in_python_env.sh out/venv \
257281
'./scripts/tests/run_kotlin_test.py \
@@ -263,6 +287,8 @@ jobs:
263287
--factoryreset \
264288
'
265289
- name: Run Kotlin IM Invoke Test
290+
# Generally completes in seconds
291+
timeout-minutes: 2
266292
run: |
267293
scripts/run_in_python_env.sh out/venv \
268294
'./scripts/tests/run_kotlin_test.py \
@@ -274,6 +300,8 @@ jobs:
274300
--factoryreset \
275301
'
276302
- name: Run Kotlin IM Read Test
303+
# Generally completes in seconds
304+
timeout-minutes: 2
277305
run: |
278306
scripts/run_in_python_env.sh out/venv \
279307
'./scripts/tests/run_kotlin_test.py \
@@ -285,6 +313,8 @@ jobs:
285313
--factoryreset \
286314
'
287315
- name: Run Kotlin IM Write Test
316+
# Generally completes in seconds
317+
timeout-minutes: 2
288318
run: |
289319
scripts/run_in_python_env.sh out/venv \
290320
'./scripts/tests/run_kotlin_test.py \
@@ -296,6 +326,8 @@ jobs:
296326
--factoryreset \
297327
'
298328
- name: Run Kotlin IM Subscribe Test
329+
# Generally completes in seconds
330+
timeout-minutes: 2
299331
run: |
300332
scripts/run_in_python_env.sh out/venv \
301333
'./scripts/tests/run_kotlin_test.py \

‎docs/upgrading.md

+5
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,8 @@ To preserve `codegen/zap` generated logic, use
102102
`CodegenDataModelProviderInstance` (see changes in
103103
[36558](https://github.com/project-chip/connectedhomeip/pull/36558) and
104104
[36613](https://github.com/project-chip/connectedhomeip/pull/36613) ).
105+
106+
To use default attribute persistence, you need to pass in a
107+
`PersistentStorageDelegate` to `CodegenDataModelProviderInstance`. See example
108+
changes in [36658](https://github.com/project-chip/connectedhomeip/pull/36658)
109+
).

‎examples/air-purifier-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static void InitServer(intptr_t context)
135135
// Init ZCL Data Model and CHIP App Server
136136
static chip::CommonCaseDeviceServerInitParams initParams;
137137
(void) initParams.InitializeStaticResourcesBeforeServerInit();
138-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
138+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
139139
#if CONFIG_ENABLE_AMEBA_CRYPTO
140140
ChipLogProgress(DeviceLayer, "platform crypto enabled!");
141141
static chip::AmebaPersistentStorageOperationalKeystore sAmebaPersistentStorageOpKeystore;

‎examples/air-purifier-app/cc32xx/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ int AppTask::Init()
165165
PLAT_LOG("Initialize Server");
166166
static chip::CommonCaseDeviceServerInitParams initParams;
167167
(void) initParams.InitializeStaticResourcesBeforeServerInit();
168-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
168+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
169169
chip::Server::GetInstance().Init(initParams);
170170

171171
// Initialize device attestation config

‎examples/all-clusters-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static void InitServer(intptr_t context)
150150
initParams.appDelegate = &sAmebaObserver;
151151

152152
initParams.InitializeStaticResourcesBeforeServerInit();
153-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
153+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
154154

155155
#if CONFIG_ENABLE_AMEBA_CRYPTO
156156
ChipLogProgress(DeviceLayer, "platform crypto enabled!");

‎examples/all-clusters-app/asr/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ asr_executable("clusters_app") {
111111
"${chip_root}/examples/all-clusters-app/all-clusters-common",
112112
"${chip_root}/examples/common/QRCode",
113113
"${chip_root}/examples/providers:device_info_provider",
114+
"${chip_root}/src/app:attribute-persistence",
114115
"${chip_root}/src/lib",
115116
"${chip_root}/src/platform/logging:default",
116117
"${chip_root}/src/setup_payload",

‎examples/all-clusters-app/infineon/psoc6/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ psoc6_executable("clusters_app") {
148148
"${chip_root}/examples/all-clusters-app/all-clusters-common",
149149
"${chip_root}/examples/common/QRCode",
150150
"${chip_root}/examples/providers:device_info_provider",
151+
"${chip_root}/src/app:attribute-persistence",
151152
"${chip_root}/src/lib",
152153
"${chip_root}/src/platform/logging:default",
153154
"${chip_root}/src/setup_payload",

‎examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ static void InitServer(intptr_t context)
130130
// Init ZCL Data Model
131131
static chip::CommonCaseDeviceServerInitParams initParams;
132132
(void) initParams.InitializeStaticResourcesBeforeServerInit();
133-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
133+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
134134
chip::Server::GetInstance().Init(initParams);
135135

136136
// We only have network commissioning on endpoint 0.

‎examples/all-clusters-app/linux/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ source_set("chip-all-clusters-common") {
9292
deps = [
9393
"${chip_root}/examples/all-clusters-app/all-clusters-common",
9494
"${chip_root}/examples/platform/linux:app-main",
95+
"${chip_root}/src/app:attribute-persistence",
9596
"${chip_root}/src/app/tests/suites/credentials:dac_provider",
9697
"${chip_root}/src/lib",
9798
"${chip_root}/third_party/jsoncpp",

‎examples/all-clusters-app/linux/fuzzing-main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
5757
// ChipLinuxAppMainLoop blocks, and we don't want that here.
5858
static chip::CommonCaseDeviceServerInitParams initParams;
5959
(void) initParams.InitializeStaticResourcesBeforeServerInit();
60-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
60+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
6161
VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR);
6262

6363
ApplicationInit();

‎examples/all-clusters-app/mbed/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ int AppTask::Init()
7272
// Init ZCL Data Model and start server
7373
static chip::CommonCaseDeviceServerInitParams initParams;
7474
(void) initParams.InitializeStaticResourcesBeforeServerInit();
75-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
75+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
7676
error = Server::GetInstance().Init(initParams);
7777
if (error != CHIP_NO_ERROR)
7878
{

‎examples/all-clusters-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ CHIP_ERROR AppTask::Init()
227227
initParams.operationalKeystore = &sPSAOperationalKeystore;
228228
#endif
229229
(void) initParams.InitializeStaticResourcesBeforeServerInit();
230-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
230+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
231231
initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
232232
ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
233233
AppFabricTableDelegate::Init();

‎examples/all-clusters-app/nxp/mw320/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ mw320_executable("shell_mw320") {
6464
]
6565

6666
deps = [
67+
"${chip_root}/src/app:attribute-persistence",
6768
"${chip_root}/src/platform:syscalls_stub",
6869
"${chip_root}/src/platform/logging:default",
6970
]

‎examples/all-clusters-app/nxp/mw320/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ static void run_chip_srv(System::Layer * aSystemLayer, void * aAppState)
10691069

10701070
static chip::CommonCaseDeviceServerInitParams initParams;
10711071
(void) initParams.InitializeStaticResourcesBeforeServerInit();
1072-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
1072+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
10731073
chip::Server::GetInstance().Init(initParams);
10741074
PRINTF("Done to call chip::Server() \r\n");
10751075
}

‎examples/all-clusters-app/tizen/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ source_set("chip-all-clusters-common") {
5353
deps = [
5454
"${chip_root}/examples/all-clusters-app/all-clusters-common",
5555
"${chip_root}/examples/platform/tizen:app-main",
56+
"${chip_root}/src/app:attribute-persistence",
5657
"${chip_root}/src/lib/shell:shell_core",
5758
]
5859

‎examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ static void InitServer(intptr_t context)
159159
// Init ZCL Data Model and CHIP App Server
160160
static chip::CommonCaseDeviceServerInitParams initParams;
161161
initParams.InitializeStaticResourcesBeforeServerInit();
162-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
162+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
163163

164164
static AmebaObserver sAmebaObserver;
165165
initParams.appDelegate = &sAmebaObserver;

‎examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static void InitServer(intptr_t context)
128128
// Init ZCL Data Model
129129
static chip::CommonCaseDeviceServerInitParams initParams;
130130
(void) initParams.InitializeStaticResourcesBeforeServerInit();
131-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
131+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
132132
chip::Server::GetInstance().Init(initParams);
133133

134134
// We only have network commissioning on endpoint 0.

‎examples/all-clusters-minimal-app/linux/fuzzing-main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * aData, size_t aSize)
4444
// ChipLinuxAppMainLoop blocks, and we don't want that here.
4545
static chip::CommonCaseDeviceServerInitParams initParams;
4646
(void) initParams.InitializeStaticResourcesBeforeServerInit();
47-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
47+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
4848
VerifyOrDie(Server::GetInstance().Init(initParams) == CHIP_NO_ERROR);
4949

5050
ApplicationInit();

‎examples/all-clusters-minimal-app/mbed/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ int AppTask::Init()
6868
// Init ZCL Data Model and start server
6969
static chip::CommonCaseDeviceServerInitParams initParams;
7070
(void) initParams.InitializeStaticResourcesBeforeServerInit();
71-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
71+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
7272
error = Server::GetInstance().Init(initParams);
7373
if (error != CHIP_NO_ERROR)
7474
{

‎examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ CHIP_ERROR AppTask::Init()
174174
initParams.operationalKeystore = &sPSAOperationalKeystore;
175175
#endif
176176
(void) initParams.InitializeStaticResourcesBeforeServerInit();
177-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
177+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
178178
ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
179179
AppFabricTableDelegate::Init();
180180

‎examples/chef/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static void InitServer(intptr_t context)
106106
// Init ZCL Data Model and CHIP App Server
107107
static chip::CommonCaseDeviceServerInitParams initParams;
108108
initParams.InitializeStaticResourcesBeforeServerInit();
109-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
109+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
110110

111111
static AmebaObserver sAmebaObserver;
112112
initParams.appDelegate = &sAmebaObserver;

‎examples/chef/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void InitServer(intptr_t)
160160
// Start IM server
161161
static chip::CommonCaseDeviceServerInitParams initParams;
162162
(void) initParams.InitializeStaticResourcesBeforeServerInit();
163-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
163+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
164164
chip::Server::GetInstance().Init(initParams);
165165

166166
// Device Attestation & Onboarding codes

‎examples/chef/nrfconnect/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ int main()
126126
initParams.operationalKeystore = &sPSAOperationalKeystore;
127127
#endif
128128
(void) initParams.InitializeStaticResourcesBeforeServerInit();
129-
initParams.dataModelProvider = app::CodegenDataModelProviderInstance();
129+
initParams.dataModelProvider = app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
130130
err = chip::Server::GetInstance().Init(initParams);
131131
if (err != CHIP_NO_ERROR)
132132
{

‎examples/chip-tool/commands/common/CHIPCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ CHIP_ERROR CHIPCommand::MaybeSetUpStack()
138138
factoryInitParams.opCertStore = &mOpCertStore;
139139
factoryInitParams.enableServerInteractions = NeedsOperationalAdvertising();
140140
factoryInitParams.sessionKeystore = &sSessionKeystore;
141-
factoryInitParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance();
141+
factoryInitParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(&mDefaultStorage);
142142

143143
// Init group data provider that will be used for all group keys and IPKs for the
144144
// chip-tool-configured fabrics. This is OK to do once since the fabric tables

‎examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ void AppTask::InitServer(intptr_t arg)
299299
{
300300
static chip::CommonCaseDeviceServerInitParams initParams;
301301
(void) initParams.InitializeStaticResourcesBeforeServerInit();
302-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
302+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
303303

304304
auto & infoProvider = chip::DeviceLayer::DeviceInfoProviderImpl::GetDefaultInstance();
305305
infoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);

‎examples/energy-management-app/linux/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ executable("chip-energy-management-app") {
6464
deps = [
6565
"${chip_root}/examples/energy-management-app/energy-management-common",
6666
"${chip_root}/examples/platform/linux:app-main",
67+
"${chip_root}/src/app:attribute-persistence",
6768
"${chip_root}/src/lib",
6869
]
6970

‎examples/energy-management-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ silabs_executable("energy-management-app") {
195195

196196
deps = [
197197
":sdk",
198+
"${chip_root}/src/app:attribute-persistence",
198199
app_data_model,
199200
]
200201

‎examples/fabric-admin/commands/common/CHIPCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ CHIP_ERROR CHIPCommand::MaybeSetUpStack()
123123
factoryInitParams.opCertStore = &mOpCertStore;
124124
factoryInitParams.enableServerInteractions = NeedsOperationalAdvertising();
125125
factoryInitParams.sessionKeystore = &sSessionKeystore;
126-
factoryInitParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance();
126+
factoryInitParams.dataModelProvider = chip::app::CodegenDataModelProviderInstance(&mDefaultStorage);
127127

128128
// Init group data provider that will be used for all group keys and IPKs for the
129129
// fabric-admin-configured fabrics. This is OK to do once since the fabric tables

‎examples/light-switch-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static void InitServer(intptr_t context)
105105
// Init ZCL Data Model and CHIP App Server
106106
static chip::CommonCaseDeviceServerInitParams initParams;
107107
initParams.InitializeStaticResourcesBeforeServerInit();
108-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
108+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
109109
#if CONFIG_ENABLE_AMEBA_CRYPTO
110110
ChipLogProgress(DeviceLayer, "platform crypto enabled!");
111111
static chip::AmebaPersistentStorageOperationalKeystore sAmebaPersistentStorageOpKeystore;

‎examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ int AppTask::Init()
325325
static DefaultTestEventTriggerDelegate sTestEventTriggerDelegate{ ByteSpan(sTestEventTriggerEnableKey) };
326326
initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
327327
(void) initParams.InitializeStaticResourcesBeforeServerInit();
328-
initParams.dataModelProvider = CodegenDataModelProviderInstance();
328+
initParams.dataModelProvider = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
329329

330330
// Initialize info provider
331331
sExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);

0 commit comments

Comments
 (0)