remove address resolve change that are out of scope

Author: mkardous-silabs

src/app/icd/server/ICDCheckInSender.cpp

@@ -27,14 +27,10 @@ namespace app {
 
 using namespace Protocols::SecureChannel;
 
-ICDCheckInSender::ICDCheckInSender(Messaging::ExchangeManager * exchangeManager, AddressResolve::Resolver * addressResolver)
+ICDCheckInSender::ICDCheckInSender(Messaging::ExchangeManager * exchangeManager)
 {
     VerifyOrDie(exchangeManager != nullptr);
-    VerifyOrDie(addressResolver != nullptr);
-
     mExchangeManager = exchangeManager;
-    mAddressResolver = addressResolver;
-
     mAddressLookupHandle.SetListener(this);
 }
 
@@ -111,7 +107,7 @@ CHIP_ERROR ICDCheckInSender::RequestResolve(ICDMonitoringEntry & entry, FabricTa
     memcpy(mHmac128KeyHandle.AsMutable<Crypto::Symmetric128BitsKeyByteArray>(),
            entry.hmacKeyHandle.As<Crypto::Symmetric128BitsKeyByteArray>(), sizeof(Crypto::Symmetric128BitsKeyByteArray));
 
-    CHIP_ERROR err = mAddressResolver->LookupNode(request, mAddressLookupHandle);
+    CHIP_ERROR err = AddressResolve::Resolver::Instance().LookupNode(request, mAddressLookupHandle);
 
     if (err == CHIP_NO_ERROR)
     {

src/app/icd/server/ICDCheckInSender.h

@@ -31,7 +31,7 @@ namespace app {
 class ICDCheckInSender : public AddressResolve::NodeListener
 {
 public:
-    ICDCheckInSender(Messaging::ExchangeManager * exchangeManager, AddressResolve::Resolver * mAddressResolver);
+    ICDCheckInSender(Messaging::ExchangeManager * exchangeManager);
     ~ICDCheckInSender() = default;
 
     CHIP_ERROR RequestResolve(ICDMonitoringEntry & entry, FabricTable * fabricTable, uint32_t counter);
@@ -50,7 +50,6 @@ class ICDCheckInSender : public AddressResolve::NodeListener
     // This is used when a node address is required.
     AddressResolve::NodeLookupHandle mAddressLookupHandle;
 
-    AddressResolve::Resolver * mAddressResolver   = nullptr;
     Messaging::ExchangeManager * mExchangeManager = nullptr;
 
     Crypto::Aes128KeyHandle mAes128KeyHandle   = Crypto::Aes128KeyHandle();

src/app/icd/server/ICDManager.cpp

@@ -52,16 +52,14 @@ static_assert(UINT8_MAX >= CHIP_CONFIG_MAX_EXCHANGE_CONTEXTS,
               "ICDManager::mOpenExchangeContextCount cannot hold count for the max exchange count");
 
 void ICDManager::Init(PersistentStorageDelegate * storage, FabricTable * fabricTable, Crypto::SymmetricKeystore * symmetricKeystore,
-                      Messaging::ExchangeManager * exchangeManager, SubscriptionsInfoProvider * subInfoProvider,
-                      AddressResolve::Resolver * addressResolver)
+                      Messaging::ExchangeManager * exchangeManager, SubscriptionsInfoProvider * subInfoProvider)
 {
 #if CHIP_CONFIG_ENABLE_ICD_CIP
     VerifyOrDie(storage != nullptr);
     VerifyOrDie(fabricTable != nullptr);
     VerifyOrDie(symmetricKeystore != nullptr);
     VerifyOrDie(exchangeManager != nullptr);
     VerifyOrDie(subInfoProvider != nullptr);
-    VerifyOrDie(addressResolver != nullptr);
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 
 #if CHIP_CONFIG_ENABLE_ICD_LIT
@@ -89,7 +87,6 @@ void ICDManager::Init(PersistentStorageDelegate * storage, FabricTable * fabricT
     mSymmetricKeystore = symmetricKeystore;
     mExchangeManager   = exchangeManager;
     mSubInfoProvider   = subInfoProvider;
-    mAddressResolver   = addressResolver;
 
     VerifyOrDie(ICDConfigurationData::GetInstance().GetICDCounter().Init(mStorage, DefaultStorageKeyAllocator::ICDCheckInCounter(),
                                                                          ICDConfigurationData::kICDCounterPersistenceIncrement) ==
@@ -117,7 +114,6 @@ void ICDManager::Shutdown()
     mStorage         = nullptr;
     mFabricTable     = nullptr;
     mSubInfoProvider = nullptr;
-    mAddressResolver = nullptr;
     mICDSenderPool.ReleaseAll();
 
 #if CHIP_CONFIG_PERSIST_SUBSCRIPTIONS && !CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION
@@ -217,7 +213,7 @@ void ICDManager::SendCheckInMsgs()
 
             // SenderPool will be released upon transition from active to idle state
             // This will happen when all ICD Check-In messages are sent on the network
-            ICDCheckInSender * sender = mICDSenderPool.CreateObject(mExchangeManager, mAddressResolver);
+            ICDCheckInSender * sender = mICDSenderPool.CreateObject(mExchangeManager);
             VerifyOrReturn(sender != nullptr, ChipLogError(AppServer, "Failed to allocate ICDCheckinSender"));
 
             if (CHIP_NO_ERROR != sender->RequestResolve(entry, mFabricTable, counterValue))

src/app/icd/server/ICDManager.h

@@ -26,7 +26,6 @@
 #include <app/icd/server/ICDStateObserver.h>
 #include <credentials/FabricTable.h>
 #include <crypto/SessionKeystore.h>
-#include <lib/address_resolve/AddressResolve.h>
 #include <lib/support/BitFlags.h>
 #include <messaging/ExchangeMgr.h>
 #include <platform/CHIPDeviceConfig.h>
@@ -116,8 +115,7 @@ class ICDManager : public ICDListener, public TestEventTriggerHandler
     ~ICDManager() = default;
 
     void Init(PersistentStorageDelegate * storage, FabricTable * fabricTable, Crypto::SymmetricKeystore * symmetricKeyStore,
-              Messaging::ExchangeManager * exchangeManager, SubscriptionsInfoProvider * subInfoProvider,
-              AddressResolve::Resolver * adressResolver);
+              Messaging::ExchangeManager * exchangeManager, SubscriptionsInfoProvider * subInfoProvider);
     void Shutdown();
 
     /**
@@ -325,7 +323,6 @@ class ICDManager : public ICDListener, public TestEventTriggerHandler
     Messaging::ExchangeManager * mExchangeManager  = nullptr;
     Crypto::SymmetricKeystore * mSymmetricKeystore = nullptr;
     SubscriptionsInfoProvider * mSubInfoProvider   = nullptr;
-    AddressResolve::Resolver * mAddressResolver    = nullptr;
     ObjectPool<ICDCheckInSender, (CHIP_CONFIG_ICD_CLIENTS_SUPPORTED_PER_FABRIC * CHIP_CONFIG_MAX_FABRICS)> mICDSenderPool;
 #endif // CHIP_CONFIG_ENABLE_ICD_CIP
 

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

@@ -124,19 +124,6 @@ class TestSubscriptionsInfoProvider : public SubscriptionsInfoProvider
     bool mHasPersistedSubscription = false;
 };
 
-class TestAddressResolver : public AddressResolve::Resolver
-{
-public:
-    TestAddressResolver()          = default;
-    virtual ~TestAddressResolver() = default;
-
-    CHIP_ERROR Init(System::Layer * systemLayer) override { return CHIP_NO_ERROR; };
-    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{};
-};
-
 System::Clock::Internal::MockClock * pMockClock          = nullptr;
 System::Clock::ClockBase * pRealClock                    = nullptr;
 chip::Test::LoopbackMessagingContext * pMessagingContext = nullptr;
@@ -218,7 +205,7 @@ class TestICDManager : public ::testing::Test
         mICDStateObserver.ResetAll();
         mICDManager.RegisterObserver(&mICDStateObserver);
         mICDManager.Init(&testStorage, &(pMessagingContext->GetFabricTable()), &mKeystore,
-                         &(pMessagingContext->GetExchangeManager()), &mSubInfoProvider, &mAddressResolver);
+                         &(pMessagingContext->GetExchangeManager()), &mSubInfoProvider);
     }
 
     // Performs teardown for each individual test in the test suite
@@ -228,7 +215,6 @@ class TestICDManager : public ::testing::Test
         pMessagingContext->TearDown();
     }
 
-    TestAddressResolver mAddressResolver;
     TestSessionKeystoreImpl mKeystore;
     ICDManager mICDManager;
     TestSubscriptionsInfoProvider mSubInfoProvider;
@@ -591,7 +577,7 @@ TEST_F(TestICDManager, TestICDCounter)
     // Shut down and reinit ICDManager to increment counter
     mICDManager.Shutdown();
     mICDManager.Init(&(testStorage), &(pMessagingContext->GetFabricTable()), &(mKeystore),
-                     &(pMessagingContext->GetExchangeManager()), &(mSubInfoProvider), &mAddressResolver);
+                     &(pMessagingContext->GetExchangeManager()), &(mSubInfoProvider));
     mICDManager.RegisterObserver(&(mICDStateObserver));
 
     EXPECT_EQ(counter + ICDConfigurationData::kICDCounterPersistenceIncrement,
@@ -997,7 +983,7 @@ TEST_F(TestICDManager, TestICDStateObserverOnICDModeChangeOnInit)
     mICDManager.Shutdown();
     mICDManager.RegisterObserver(&(mICDStateObserver));
     mICDManager.Init(&testStorage, &(pMessagingContext->GetFabricTable()), &mKeystore, &(pMessagingContext->GetExchangeManager()),
-                     &mSubInfoProvider, &mAddressResolver);
+                     &mSubInfoProvider);
 
     // We have a registration, transition to LIT mode
     EXPECT_TRUE(mICDStateObserver.mOnICDModeChangeCalled);