From 3e365988822ef2371388120cb8818ee0aabcbabb Mon Sep 17 00:00:00 2001
From: Leandro Lucarella <luca-frequenz@llucax.com>
Date: Fri, 17 Jul 2026 09:51:58 +0200
Subject: [PATCH] Remove `replace_unspecified_code_type_with`

This new keyword-only parameter was added to
`delivery_area_from_proto2()` because the system was not setting
`code_type` properly always. This has been fixed so this hack is not
needed anymore.

Signed-off-by: Leandro Lucarella <luca-frequenz@llucax.com>
---
 .../grid/proto/v1alpha8/_delivery_area.py     |  8 +---
 .../grid/proto/v1alpha8/test_delivery_area.py | 46 ++-----------------
 2 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/src/frequenz/client/common/grid/proto/v1alpha8/_delivery_area.py b/src/frequenz/client/common/grid/proto/v1alpha8/_delivery_area.py
index a7f58ed3..131e591b 100644
--- a/src/frequenz/client/common/grid/proto/v1alpha8/_delivery_area.py
+++ b/src/frequenz/client/common/grid/proto/v1alpha8/_delivery_area.py
@@ -102,8 +102,6 @@ def delivery_area_from_proto(  # noqa: DOC502
 
 def delivery_area_from_proto2(
     message: delivery_area_pb2.DeliveryArea,
-    *,
-    replace_unspecified_code_type_with: EnergyMarketCodeType = EnergyMarketCodeType.EUROPE_EIC,
 ) -> DeliveryArea | InvalidDeliveryArea:
     """Convert a protobuf message to a delivery area object.
 
@@ -123,10 +121,6 @@ def delivery_area_from_proto2(
 
     Args:
         message: The protobuf message to convert.
-        replace_unspecified_code_type_with: The default `EnergyMarketCodeType`
-            to use when the protobuf message has `code_type` of `0`
-            (`UNSPECIFIED`). This is a temporary option until delivery areas
-            consistently provide a valid `code_type`.
 
     Returns:
         A [`DeliveryArea`][....DeliveryArea] when the wire data is
@@ -135,7 +129,7 @@ def delivery_area_from_proto2(
     """
     raw_code_type = message.code_type
     code_type: EnergyMarketCodeType | int = (
-        replace_unspecified_code_type_with
+        raw_code_type
         if raw_code_type == 0
         else energy_market_code_type_from_proto(raw_code_type)
     )
diff --git a/tests/grid/proto/v1alpha8/test_delivery_area.py b/tests/grid/proto/v1alpha8/test_delivery_area.py
index 211f8d7d..c11dab4f 100644
--- a/tests/grid/proto/v1alpha8/test_delivery_area.py
+++ b/tests/grid/proto/v1alpha8/test_delivery_area.py
@@ -213,19 +213,19 @@ class _FromProto2TestCase:
             expected_type=InvalidDeliveryArea,
         ),
         _FromProto2TestCase(
-            name="unspecified_code_type_replaced_with_default",
+            name="unspecified_code_type_is_invalid",
             code="DE",
             code_type=delivery_area_pb2.EnergyMarketCodeType.ENERGY_MARKET_CODE_TYPE_UNSPECIFIED,
             expected_code="DE",
-            expected_code_type=EnergyMarketCodeType.EUROPE_EIC,
-            expected_type=DeliveryArea,
+            expected_code_type=0,
+            expected_type=InvalidDeliveryArea,
         ),
         _FromProto2TestCase(
             name="no_code_with_unspecified_code_type_is_invalid",
             code="",
             code_type=delivery_area_pb2.EnergyMarketCodeType.ENERGY_MARKET_CODE_TYPE_UNSPECIFIED,
             expected_code="",
-            expected_code_type=EnergyMarketCodeType.EUROPE_EIC,
+            expected_code_type=0,
             expected_type=InvalidDeliveryArea,
         ),
     ],
@@ -248,41 +248,3 @@ def test_from_proto2(
     assert area.code_type == case.expected_code_type
     # The new converter never logs issues.
     assert len(caplog.records) == 0
-
-
-def test_from_proto2_replaces_unspecified_code_type_with_custom_default() -> None:
-    """`replace_unspecified_code_type_with` overrides the fallback for `code_type=0`."""
-    proto = delivery_area_pb2.DeliveryArea(
-        code="PJM",
-        code_type=(
-            delivery_area_pb2.EnergyMarketCodeType.ENERGY_MARKET_CODE_TYPE_UNSPECIFIED
-        ),
-    )
-    with warnings.catch_warnings():
-        warnings.simplefilter("error", DeprecationWarning)
-        area = delivery_area_from_proto2(
-            proto, replace_unspecified_code_type_with=EnergyMarketCodeType.US_NERC
-        )
-
-    assert isinstance(area, DeliveryArea)
-    assert area.code == "PJM"
-    assert area.code_type is EnergyMarketCodeType.US_NERC
-
-
-def test_from_proto2_does_not_replace_specified_code_type() -> None:
-    """`replace_unspecified_code_type_with` is ignored when `code_type` is specified."""
-    proto = delivery_area_pb2.DeliveryArea(
-        code="10Y1001A1001A450",
-        code_type=(
-            delivery_area_pb2.EnergyMarketCodeType.ENERGY_MARKET_CODE_TYPE_EUROPE_EIC
-        ),
-    )
-    with warnings.catch_warnings():
-        warnings.simplefilter("error", DeprecationWarning)
-        area = delivery_area_from_proto2(
-            proto, replace_unspecified_code_type_with=EnergyMarketCodeType.US_NERC
-        )
-
-    assert isinstance(area, DeliveryArea)
-    assert area.code == "10Y1001A1001A450"
-    assert area.code_type is EnergyMarketCodeType.EUROPE_EIC