From 2a7d2868bea58a2571815ce0096474c10459bc1a Mon Sep 17 00:00:00 2001
From: tkdrob <tkdrob4390@yahoo.com>
Date: Mon, 15 Feb 2021 18:14:27 -0500
Subject: [PATCH] Use core constants for xiaomi_aqara (#46551)

---
 homeassistant/components/xiaomi_aqara/__init__.py    |  2 +-
 homeassistant/components/xiaomi_aqara/config_flow.py |  3 +--
 homeassistant/components/xiaomi_aqara/const.py       |  1 -
 tests/components/xiaomi_aqara/test_config_flow.py    | 12 ++++++------
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/xiaomi_aqara/__init__.py b/homeassistant/components/xiaomi_aqara/__init__.py
index c5b74e68af5..f54c262abba 100644
--- a/homeassistant/components/xiaomi_aqara/__init__.py
+++ b/homeassistant/components/xiaomi_aqara/__init__.py
@@ -13,6 +13,7 @@ from homeassistant.const import (
     CONF_HOST,
     CONF_MAC,
     CONF_PORT,
+    CONF_PROTOCOL,
     EVENT_HOMEASSISTANT_STOP,
 )
 from homeassistant.core import callback
@@ -26,7 +27,6 @@ from homeassistant.util.dt import utcnow
 from .const import (
     CONF_INTERFACE,
     CONF_KEY,
-    CONF_PROTOCOL,
     CONF_SID,
     DEFAULT_DISCOVERY_RETRY,
     DOMAIN,
diff --git a/homeassistant/components/xiaomi_aqara/config_flow.py b/homeassistant/components/xiaomi_aqara/config_flow.py
index 46d4852abae..8028d16f86a 100644
--- a/homeassistant/components/xiaomi_aqara/config_flow.py
+++ b/homeassistant/components/xiaomi_aqara/config_flow.py
@@ -6,7 +6,7 @@ import voluptuous as vol
 from xiaomi_gateway import MULTICAST_PORT, XiaomiGateway, XiaomiGatewayDiscovery
 
 from homeassistant import config_entries
-from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT
+from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT, CONF_PROTOCOL
 from homeassistant.core import callback
 from homeassistant.helpers.device_registry import format_mac
 
@@ -14,7 +14,6 @@ from homeassistant.helpers.device_registry import format_mac
 from .const import (
     CONF_INTERFACE,
     CONF_KEY,
-    CONF_PROTOCOL,
     CONF_SID,
     DEFAULT_DISCOVERY_RETRY,
     DOMAIN,
diff --git a/homeassistant/components/xiaomi_aqara/const.py b/homeassistant/components/xiaomi_aqara/const.py
index 1cc3b2d4633..11706cdb6fb 100644
--- a/homeassistant/components/xiaomi_aqara/const.py
+++ b/homeassistant/components/xiaomi_aqara/const.py
@@ -9,7 +9,6 @@ ZEROCONF_GATEWAY = "lumi-gateway"
 ZEROCONF_ACPARTNER = "lumi-acpartner"
 
 CONF_INTERFACE = "interface"
-CONF_PROTOCOL = "protocol"
 CONF_KEY = "key"
 CONF_SID = "sid"
 
diff --git a/tests/components/xiaomi_aqara/test_config_flow.py b/tests/components/xiaomi_aqara/test_config_flow.py
index 280775a7130..f52f9b8e64d 100644
--- a/tests/components/xiaomi_aqara/test_config_flow.py
+++ b/tests/components/xiaomi_aqara/test_config_flow.py
@@ -7,7 +7,7 @@ import pytest
 from homeassistant import config_entries
 from homeassistant.components import zeroconf
 from homeassistant.components.xiaomi_aqara import config_flow, const
-from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT
+from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT, CONF_PROTOCOL
 
 ZEROCONF_NAME = "name"
 ZEROCONF_PROP = "properties"
@@ -107,7 +107,7 @@ async def test_config_flow_user_success(hass):
         CONF_PORT: TEST_PORT,
         CONF_MAC: TEST_MAC,
         const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
-        const.CONF_PROTOCOL: TEST_PROTOCOL,
+        CONF_PROTOCOL: TEST_PROTOCOL,
         const.CONF_KEY: TEST_KEY,
         const.CONF_SID: TEST_SID,
     }
@@ -159,7 +159,7 @@ async def test_config_flow_user_multiple_success(hass):
         CONF_PORT: TEST_PORT,
         CONF_MAC: TEST_MAC,
         const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
-        const.CONF_PROTOCOL: TEST_PROTOCOL,
+        CONF_PROTOCOL: TEST_PROTOCOL,
         const.CONF_KEY: TEST_KEY,
         const.CONF_SID: TEST_SID,
     }
@@ -196,7 +196,7 @@ async def test_config_flow_user_no_key_success(hass):
         CONF_PORT: TEST_PORT,
         CONF_MAC: TEST_MAC,
         const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
-        const.CONF_PROTOCOL: TEST_PROTOCOL,
+        CONF_PROTOCOL: TEST_PROTOCOL,
         const.CONF_KEY: None,
         const.CONF_SID: TEST_SID,
     }
@@ -243,7 +243,7 @@ async def test_config_flow_user_host_mac_success(hass):
         CONF_PORT: TEST_PORT,
         CONF_MAC: TEST_MAC,
         const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
-        const.CONF_PROTOCOL: TEST_PROTOCOL,
+        CONF_PROTOCOL: TEST_PROTOCOL,
         const.CONF_KEY: None,
         const.CONF_SID: TEST_SID,
     }
@@ -433,7 +433,7 @@ async def test_zeroconf_success(hass):
         CONF_PORT: TEST_PORT,
         CONF_MAC: TEST_MAC,
         const.CONF_INTERFACE: config_flow.DEFAULT_INTERFACE,
-        const.CONF_PROTOCOL: TEST_PROTOCOL,
+        CONF_PROTOCOL: TEST_PROTOCOL,
         const.CONF_KEY: TEST_KEY,
         const.CONF_SID: TEST_SID,
     }