Remove the conditionnal storage of EFS

project-chip · Nov 28, 2023 · 60146af · 60146af
1 parent b962d8a
commit 60146af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/app/clusters/scenes-server/SceneTableImpl.cpp b/src/app/clusters/scenes-server/SceneTableImpl.cpp
@@ -149,11 +149,8 @@ struct SceneTableData : public SceneTableEntry, PersistentData<kPersistentSceneB
         }
 
         ReturnErrorOnFailure(writer.Put(TLV::ContextTag(TagScene::kTransitionTimeMs), mStorageData.mSceneTransitionTimeMs));
+        ReturnErrorOnFailure(mStorageData.mExtensionFieldSets.Serialize(writer));
 
-        if (!mStorageData.mExtensionFieldSets.IsEmpty())
-        {
-            ReturnErrorOnFailure(mStorageData.mExtensionFieldSets.Serialize(writer));
-        }
         return writer.EndContainer(container);
     }
 
@@ -187,12 +184,7 @@ struct SceneTableData : public SceneTableEntry, PersistentData<kPersistentSceneB
         mStorageData.SetName(nameSpan);
         ReturnErrorOnFailure(reader.Get(mStorageData.mSceneTransitionTimeMs));
 
-        CHIP_ERROR err = reader.Next();
-        if (CHIP_END_OF_TLV != err)
-        {
-            VerifyOrReturnError(TLV::kTLVType_Array == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE);
-            ReturnErrorOnFailure(mStorageData.mExtensionFieldSets.Deserialize(reader));
-        }
+        ReturnErrorOnFailure(mStorageData.mExtensionFieldSets.Deserialize(reader));
 
         return reader.ExitContainer(container);
     }

diff --git a/src/lib/core/CHIPConfig.h b/src/lib/core/CHIPConfig.h
@@ -1473,7 +1473,7 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
  *  }
  *
  *  Including all the TLV fields, the following values can help estimate the needed size for a scenes given a number of clusters:
- *  Empty EFS Scene Max name size: 34 bytes
+ *  Empty EFS Scene Max name size: 37 bytes
  *  Scene Max name size + OnOff : 55 bytes
  *  Scene Max name size + LevelControl : 64 bytes
  *  Scene Max name size + ColorControl : 130 bytes