Use marker only in AddNOC case

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

src/app/FailSafeContext.cpp

@@ -40,13 +40,12 @@ namespace {
 
 // Tags for marker storage
 constexpr TLV::Tag kMarkerFabricIndexTag = TLV::ContextTag(0);
-constexpr TLV::Tag kMarkerIsAdditionTag  = TLV::ContextTag(1);
 
 constexpr size_t MarkerContextTLVMaxSize()
 {
     // Add 2x uncommitted uint64_t to leave space for backwards/forwards
     // versioning for this critical feature that runs at boot.
-    return TLV::EstimateStructOverhead(sizeof(FabricIndex), sizeof(bool), sizeof(uint64_t), sizeof(uint64_t));
+    return TLV::EstimateStructOverhead(sizeof(FabricIndex), sizeof(uint64_t), sizeof(uint64_t));
 }
 
 } // namespace
@@ -198,9 +197,6 @@ CHIP_ERROR FailSafeContext::GetMarker(Marker & outMarker)
     ReturnErrorOnFailure(reader.Next(kMarkerFabricIndexTag));
     ReturnErrorOnFailure(reader.Get(outMarker.fabricIndex));
 
-    ReturnErrorOnFailure(reader.Next(kMarkerIsAdditionTag));
-    ReturnErrorOnFailure(reader.Get(outMarker.isAddition));
-
     // Don't try to exit container: we got all we needed. This allows us to
     // avoid erroring-out on newer versions.
 
@@ -218,7 +214,6 @@ CHIP_ERROR FailSafeContext::StoreMarker(const Marker & marker)
     TLV::TLVType outerType;
     ReturnErrorOnFailure(writer.StartContainer(TLV::AnonymousTag(), TLV::kTLVType_Structure, outerType));
     ReturnErrorOnFailure(writer.Put(kMarkerFabricIndexTag, marker.fabricIndex));
-    ReturnErrorOnFailure(writer.Put(kMarkerIsAdditionTag, marker.isAddition));
     ReturnErrorOnFailure(writer.EndContainer(outerType));
 
     const auto markerContextTLVLength = writer.GetLengthWritten();

src/app/FailSafeContext.h

@@ -61,7 +61,7 @@ class FailSafeContext
     {
         mFabricIndex = nocFabricIndex;
 
-        Marker marker{ mFabricIndex, true };
+        Marker marker{ mFabricIndex };
         return StoreMarker(marker) == CHIP_NO_ERROR;
     }
 
@@ -71,14 +71,6 @@ class FailSafeContext
         mFabricIndex                 = nocFabricIndex;
     }
 
-    bool SetUpdateNocCommandStarted(FabricIndex nocFabricIndex)
-    {
-        mFabricIndex = nocFabricIndex;
-
-        Marker marker{ mFabricIndex, false };
-        return StoreMarker(marker) == CHIP_NO_ERROR;
-    }
-
     void SetUpdateNocCommandInvoked() { mUpdateNocCommandHasBeenInvoked = true; }
     void SetAddTrustedRootCertInvoked() { mAddTrustedRootCertHasBeenInvoked = true; }
     void SetCsrRequestForUpdateNoc(bool isForUpdateNoc) { mIsCsrRequestForUpdateNoc = isForUpdateNoc; }
@@ -134,9 +126,8 @@ class FailSafeContext
     struct Marker
     {
         Marker() = default;
-        Marker(FabricIndex fabricIndex_, bool isAddition_) : fabricIndex{ fabricIndex_ }, isAddition{ isAddition_ } {}
+        Marker(FabricIndex fabricIndex_) : fabricIndex{ fabricIndex_ } {}
         FabricIndex fabricIndex = kUndefinedFabricIndex;
-        bool isAddition         = false;
     };
 
     PersistentStorageDelegate * mStorage   = nullptr;

src/app/clusters/operational-credentials-server/operational-credentials-server.cpp

@@ -812,9 +812,6 @@ bool emberAfOperationalCredentialsClusterUpdateNOCCallback(app::CommandHandler *
     // Flush acks before really slow work
     commandObj->FlushAcksRightAwayOnSlowCommand();
 
-    // Inform FailSafeContext about starting updating NOC for specified fabric
-    VerifyOrExit(failSafeContext.SetUpdateNocCommandStarted(fabricIndex), nonDefaultStatus = Status::Failure);
-
     err = fabricTable.UpdatePendingFabricWithOperationalKeystore(fabricIndex, NOCValue, ICACValue.ValueOr(ByteSpan{}));
     VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));