EnergyPreference: Simplify logic around interaction with delegate

`Optional<CharSpan>` is directly constructible from `Optional<MutableCharSpan>`
project-chip · Feb 22, 2024 · adfbc00 · adfbc00
1 parent b8de5cc
commit adfbc00
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/app/clusters/energy-preference-server/energy-preference-server.cpp b/src/app/clusters/energy-preference-server/energy-preference-server.cpp
@@ -78,9 +78,7 @@ CHIP_ERROR EnergyPrefAttrAccess::Read(const ConcreteReadAttributePath & aPath, A
                     Optional<MutableCharSpan> label{ MutableCharSpan(buffer) };
                     if ((err = gsDelegate->GetEnergyBalanceAtIndex(endpoint, index, step, label)) == CHIP_NO_ERROR)
                     {
-                        BalanceStruct::Type balance = { step,
-                                                        label.HasValue() ? Optional<CharSpan>(label.Value())
-                                                                         : Optional<CharSpan>() };
+                        BalanceStruct::Type balance = { step, Optional<CharSpan>(label) };
                         ReturnErrorOnFailure(encoder.Encode(balance));
                         index++;
                     }
@@ -137,9 +135,7 @@ CHIP_ERROR EnergyPrefAttrAccess::Read(const ConcreteReadAttributePath & aPath, A
                     Optional<MutableCharSpan> label{ MutableCharSpan(buffer) };
                     if ((err = gsDelegate->GetLowPowerModeSensitivityAtIndex(endpoint, index, step, label)) == CHIP_NO_ERROR)
                     {
-                        BalanceStruct::Type balance = { step,
-                                                        label.HasValue() ? Optional<CharSpan>(label.Value())
-                                                                         : Optional<CharSpan>() };
+                        BalanceStruct::Type balance = { step, Optional<CharSpan>(label) };
                         ReturnErrorOnFailure(encoder.Encode(balance));
                         index++;
                     }