From 09b4b7eb3787c4fc8eb4831985aa2b784247c1eb Mon Sep 17 00:00:00 2001
From: Martin Hjelmare <marhje52@gmail.com>
Date: Mon, 25 Apr 2022 14:21:03 +0200
Subject: [PATCH] Remove hass.helpers from config_entries (#70660)

---
 homeassistant/config_entries.py | 13 ++++++-------
 tests/common.py                 |  2 --
 tests/test_config_entries.py    |  4 +---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 933cebebcf5..4b0fa9dd8c9 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -19,7 +19,7 @@ from .components import persistent_notification
 from .const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP, Platform
 from .core import CALLBACK_TYPE, CoreState, Event, HomeAssistant, callback
 from .exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady, HomeAssistantError
-from .helpers import device_registry, entity_registry
+from .helpers import device_registry, entity_registry, storage
 from .helpers.event import async_call_later
 from .helpers.frame import report
 from .helpers.typing import UNDEFINED, ConfigType, DiscoveryInfoType, UndefinedType
@@ -803,7 +803,7 @@ class ConfigEntries:
         self._hass_config = hass_config
         self._entries: dict[str, ConfigEntry] = {}
         self._domain_index: dict[str, list[str]] = {}
-        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
+        self._store = storage.Store(hass, STORAGE_VERSION, STORAGE_KEY)
         EntityRegistryDisabledHandler(hass).async_setup()
 
     @callback
@@ -863,10 +863,8 @@ class ConfigEntries:
             del self._domain_index[entry.domain]
         self._async_schedule_save()
 
-        dev_reg, ent_reg = await asyncio.gather(
-            self.hass.helpers.device_registry.async_get_registry(),
-            self.hass.helpers.entity_registry.async_get_registry(),
-        )
+        dev_reg = device_registry.async_get(self.hass)
+        ent_reg = entity_registry.async_get(self.hass)
 
         dev_reg.async_clear_config_entry(entry_id)
         ent_reg.async_clear_config_entry(entry_id)
@@ -911,7 +909,8 @@ class ConfigEntries:
     async def async_initialize(self) -> None:
         """Initialize config entry config."""
         # Migrating for config entries stored before 0.73
-        config = await self.hass.helpers.storage.async_migrator(
+        config = await storage.async_migrator(
+            self.hass,
             self.hass.config.path(PATH_CONFIG),
             self._store,
             old_conf_migrate_func=_old_conf_migrator,
diff --git a/tests/common.py b/tests/common.py
index d86aaaa3ab8..1e789b6c4f5 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -292,8 +292,6 @@ async def async_test_home_assistant(loop, load_registries=True):
             "_": "Not empty or else some bad checks for hass config in discovery.py breaks"
         },
     )
-    hass.config_entries._entries = {}
-    hass.config_entries._store._async_ensure_stop_listener = lambda: None
 
     # Load the registries
     if load_registries:
diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py
index 2c3092427dc..3611c204ba7 100644
--- a/tests/test_config_entries.py
+++ b/tests/test_config_entries.py
@@ -61,8 +61,6 @@ def mock_handlers():
 def manager(hass):
     """Fixture of a loaded config manager."""
     manager = config_entries.ConfigEntries(hass, {})
-    manager._entries = {}
-    manager._store._async_ensure_stop_listener = lambda: None
     hass.config_entries = manager
     return manager
 
@@ -2305,6 +2303,7 @@ async def test_async_setup_init_entry(hass):
 
 async def test_async_setup_init_entry_completes_before_loaded_event_fires(hass):
     """Test a config entry being initialized during integration setup before the loaded event fires."""
+    load_events: list[Event] = []
 
     @callback
     def _record_load(event: Event) -> None:
@@ -2312,7 +2311,6 @@ async def test_async_setup_init_entry_completes_before_loaded_event_fires(hass):
         load_events.append(event)
 
     listener = hass.bus.async_listen(EVENT_COMPONENT_LOADED, _record_load)
-    load_events: list[Event] = []
 
     async def mock_async_setup(hass, config):
         """Mock setup."""