Update formula tests to use battery_pool to get battery power

... instead of `logical_meter.battery_power`, which has been removed.

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

Author: shsms

tests/timeseries/_formula_engine/test_formula_composition.py

@@ -28,18 +28,16 @@ async def test_formula_composition(  # pylint: disable=too-many-locals
         mockgrid.add_solar_inverters(2)
         await mockgrid.start(mocker)
         logical_meter = microgrid.logical_meter()
-
+        battery_pool = microgrid.battery_pool()
         main_meter_recv = get_resampled_stream(
             4,
             ComponentMetricId.ACTIVE_POWER,
         )
         grid_power_recv = logical_meter.grid_power.new_receiver()
-        battery_power_recv = logical_meter.battery_power.new_receiver()
+        battery_power_recv = battery_pool.power.new_receiver()
         pv_power_recv = logical_meter.pv_power.new_receiver()
 
-        engine = (logical_meter.pv_power + logical_meter.battery_power).build(
-            "inv_power"
-        )
+        engine = (logical_meter.pv_power + battery_pool.power).build("inv_power")
         inv_calc_recv = engine.new_receiver()
 
         count = 0
@@ -69,13 +67,12 @@ async def test_formula_composition_missing_pv(self, mocker: MockerFixture) -> No
         mockgrid = MockMicrogrid(grid_side_meter=False)
         mockgrid.add_batteries(3)
         await mockgrid.start(mocker)
+        battery_pool = microgrid.battery_pool()
         logical_meter = microgrid.logical_meter()
 
-        battery_power_recv = logical_meter.battery_power.new_receiver()
+        battery_power_recv = battery_pool.power.new_receiver()
         pv_power_recv = logical_meter.pv_power.new_receiver()
-        engine = (logical_meter.pv_power + logical_meter.battery_power).build(
-            "inv_power"
-        )
+        engine = (logical_meter.pv_power + battery_pool.power).build("inv_power")
         inv_calc_recv = engine.new_receiver()
 
         count = 0
@@ -98,13 +95,12 @@ async def test_formula_composition_missing_bat(self, mocker: MockerFixture) -> N
         mockgrid = MockMicrogrid(grid_side_meter=False)
         mockgrid.add_solar_inverters(2)
         await mockgrid.start(mocker)
+        battery_pool = microgrid.battery_pool()
         logical_meter = microgrid.logical_meter()
 
-        battery_power_recv = logical_meter.battery_power.new_receiver()
+        battery_power_recv = battery_pool.power.new_receiver()
         pv_power_recv = logical_meter.pv_power.new_receiver()
-        engine = (logical_meter.pv_power + logical_meter.battery_power).build(
-            "inv_power"
-        )
+        engine = (logical_meter.pv_power + battery_pool.power).build("inv_power")
         inv_calc_recv = engine.new_receiver()
 
         count = 0

tests/timeseries/test_logical_meter.py

@@ -103,9 +103,10 @@ async def test_battery_and_pv_power(  # pylint: disable=too-many-locals
         mockgrid.add_batteries(3)
         mockgrid.add_solar_inverters(2)
         await mockgrid.start(mocker)
+        battery_pool = microgrid.battery_pool()
         logical_meter = microgrid.logical_meter()
 
-        battery_power_recv = logical_meter.battery_power.new_receiver()
+        battery_power_recv = battery_pool.power.new_receiver()
         pv_power_recv = logical_meter.pv_power.new_receiver()
 
         bat_inv_receivers = [