[MinMdns] do no stop a browse operation after the first result (project-chip#33808)

* Do not stop minmdns browse after the first result found

* Complete browsing for testing active resolve attempts

* Fix test to be clearer - remove unused data

Author: andy31415

src/lib/dnssd/ActiveResolveAttempts.cpp

@@ -53,30 +53,6 @@ void ActiveResolveAttempts::Complete(const PeerId & peerId)
 #endif
 }
 
-void ActiveResolveAttempts::CompleteCommissioner(const chip::Dnssd::DiscoveredNodeData & data)
-{
-    for (auto & item : mRetryQueue)
-    {
-        if (item.attempt.Matches(data, chip::Dnssd::DiscoveryType::kCommissionerNode))
-        {
-            item.attempt.Clear();
-            return;
-        }
-    }
-}
-
-void ActiveResolveAttempts::CompleteCommissionable(const chip::Dnssd::DiscoveredNodeData & data)
-{
-    for (auto & item : mRetryQueue)
-    {
-        if (item.attempt.Matches(data, chip::Dnssd::DiscoveryType::kCommissionableNode))
-        {
-            item.attempt.Clear();
-            return;
-        }
-    }
-}
-
 bool ActiveResolveAttempts::HasBrowseFor(chip::Dnssd::DiscoveryType type) const
 {
     for (auto & item : mRetryQueue)

src/lib/dnssd/ActiveResolveAttempts.h

@@ -250,8 +250,6 @@ class ActiveResolveAttempts
 
     /// Mark a resolution as a success, removing it from the internal list
     void Complete(const chip::PeerId & peerId);
-    void CompleteCommissioner(const chip::Dnssd::DiscoveredNodeData & data);
-    void CompleteCommissionable(const chip::Dnssd::DiscoveredNodeData & data);
     void CompleteIpResolution(SerializedQNameIterator targetHostName);
 
     /// Mark all browse-type scheduled attemptes as a success, removing them

src/lib/dnssd/Resolver_ImplMinimalMdns.cpp

@@ -424,11 +424,9 @@ void MinMdnsResolver::AdvancePendingResolverStates()
             {
             case IncrementalResolver::ServiceNameType::kCommissioner:
                 discoveredNodeIsRelevant = mActiveResolves.HasBrowseFor(chip::Dnssd::DiscoveryType::kCommissionerNode);
-                mActiveResolves.CompleteCommissioner(nodeData);
                 break;
             case IncrementalResolver::ServiceNameType::kCommissionable:
                 discoveredNodeIsRelevant = mActiveResolves.HasBrowseFor(chip::Dnssd::DiscoveryType::kCommissionableNode);
-                mActiveResolves.CompleteCommissionable(nodeData);
                 break;
             default:
                 ChipLogError(Discovery, "Unexpected type for browse data parsing");

src/lib/dnssd/tests/TestActiveResolveAttempts.cpp

@@ -126,10 +126,7 @@ TEST(TestActiveResolveAttempts, TestSingleBrowseAddRemove)
     EXPECT_EQ(attempts.GetTimeUntilNextExpectedResponse(), std::make_optional<Timeout>(1900_ms32));
 
     // once complete, nothing to schedule
-    Dnssd::DiscoveredNodeData data;
-    data.Set<chip::Dnssd::CommissionNodeData>();
-    data.Get<chip::Dnssd::CommissionNodeData>().longDiscriminator = 1234;
-    attempts.CompleteCommissionable(data);
+    attempts.CompleteAllBrowses();
     EXPECT_FALSE(attempts.GetTimeUntilNextExpectedResponse().has_value());
     EXPECT_FALSE(attempts.NextScheduled().has_value());
 }
@@ -377,10 +374,7 @@ TEST(TestActiveResolveAttempts, TestCombination)
     // Complete all, we should see no more scheduled.
     attempts.Complete(MakePeerId(2));
     attempts.Complete(MakePeerId(1));
-    Dnssd::DiscoveredNodeData data;
-    data.Set<chip::Dnssd::CommissionNodeData>();
-    data.Get<chip::Dnssd::CommissionNodeData>().longDiscriminator = 1234;
-    attempts.CompleteCommissionable(data);
+    attempts.CompleteAllBrowses();
 
     EXPECT_FALSE(attempts.GetTimeUntilNextExpectedResponse().has_value());
     EXPECT_FALSE(attempts.NextScheduled().has_value());