finish clean up

Author: mkardous-silabs

src/app/clusters/icd-management-server/icd-management-server.cpp

@@ -293,20 +293,7 @@ Status ICDManagementServer::RegisterClient(CommandHandler * commandObj, const Co
     // Save
     entry.checkInNodeID    = nodeId;
     entry.monitoredSubject = monitoredSubject;
-
-    if (commandData.clientType.HasValue())
-    {
-        ChipLogError(NotSpecified, "-------------------------------- Received Value %d",
-                     static_cast<uint8_t>(commandData.clientType.Value()));
-
-        ChipLogError(NotSpecified, "-------------------------------- Set Value %d", static_cast<uint8_t>(clientType.Value()));
-    }
-    else
-    {
-        ChipLogError(NotSpecified, "-------------------------- WHAT THE FUCK");
-    }
-
-    entry.clientType = static_cast<uint8_t>(clientType.ValueOr(ClientTypeEnum::kPermanent));
+    entry.clientType       = clientType.ValueOr(ClientTypeEnum::kPermanent);
 
     if (entry.keyHandleValid)
     {

src/app/icd/server/ICDManager.cpp

@@ -192,7 +192,7 @@ void ICDManager::SendCheckInMsgs()
                 continue;
             }
 
-            if (entry.clientType == static_cast<uint8_t>(ClientTypeEnum::kEphemeral))
+            if (entry.clientType == ClientTypeEnum::kEphemeral)
             {
                 // If the registered client is ephemeral, do not send a Check-In message
                 // continue to next entry
@@ -260,6 +260,12 @@ bool ICDManager::CheckInMessagesWouldBeSent(const std::function<ShouldCheckInMsg
                 continue;
             }
 
+            if (entry.clientType == ClientTypeEnum::kEphemeral)
+            {
+                // If the registered client is ephemeral, no Check-In message would be sent to this client
+                continue;
+            }
+
             // At least one registration would require a Check-In message
             VerifyOrReturnValue(!shouldCheckInMsgsBeSentFunction(entry.fabricIndex, entry.monitoredSubject), true);
         }

src/app/icd/server/tests/TestICDManager.cpp

@@ -134,7 +134,7 @@ class TestAddressResolver : public AddressResolve::Resolver
     CHIP_ERROR LookupNode(const NodeLookupRequest & request, Impl::NodeLookupHandle & handle) override { return CHIP_NO_ERROR; };
     CHIP_ERROR TryNextResult(Impl::NodeLookupHandle & handle) override { return CHIP_NO_ERROR; };
     CHIP_ERROR CancelLookup(Impl::NodeLookupHandle & handle, FailureCallback cancel_method) override { return CHIP_NO_ERROR; };
-    void Shutdown() override{};
+    void Shutdown() override {};
 };
 
 System::Clock::Internal::MockClock * pMockClock          = nullptr;