Rename EVChargerPool's total_{current,power} methods to current,power

Signed-off-by: Sahas Subramanian <[email protected]>

Author: shsms

src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py

@@ -87,7 +87,7 @@ def __init__(
             self._resampler_subscription_sender,
         )
 
-    async def total_current(self) -> FormulaReceiver3Phase:
+    async def current(self) -> FormulaReceiver3Phase:
         """Fetch the total current for the EV Chargers in the pool.
 
         If a formula engine to calculate EV Charger current is not already running, it
@@ -103,7 +103,7 @@ async def total_current(self) -> FormulaReceiver3Phase:
             FormulaGeneratorConfig(component_ids=self._component_ids),
         )
 
-    async def total_power(self) -> FormulaReceiver:
+    async def power(self) -> FormulaReceiver:
         """Fetch the total power for the EV Chargers in the pool.
 
         If a formula engine to calculate EV Charger power is not already running, it

tests/timeseries/_formula_engine/test_formula_composition.py

@@ -126,7 +126,7 @@ async def test_3_phase_formulas(self, mocker: MockerFixture) -> None:
         ev_pool = microgrid.ev_charger_pool()
 
         grid_current_recv = await logical_meter.grid_current()
-        ev_current_recv = await ev_pool.total_current()
+        ev_current_recv = await ev_pool.current()
 
         engine = (grid_current_recv.clone() - ev_current_recv.clone()).build(
             "net_current"

tests/timeseries/test_ev_charger_pool.py

@@ -97,7 +97,7 @@ async def test_ev_power(  # pylint: disable=too-many-locals
             ComponentMetricId.ACTIVE_POWER,
         )
         grid_power_recv = await logical_meter.grid_power()
-        ev_power_recv = await ev_pool.total_power()
+        ev_power_recv = await ev_pool.power()
 
         await synchronize_receivers([grid_power_recv, main_meter_recv, ev_power_recv])