Skip to content

Commit 016cffc

Browse files
change get_well_volume to get_liquid_volume
1 parent 5a5d9f2 commit 016cffc

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

api/src/opentrons/protocol_api/core/engine/well.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def current_liquid_height(self) -> float:
180180
labware_id=labware_id, well_name=well_name
181181
)
182182

183-
def get_well_volume(self) -> float:
183+
def get_liquid_volume(self) -> float:
184184
"""Return the current volume in a well."""
185185
labware_id = self.labware_id
186186
well_name = self._name

api/src/opentrons/protocol_api/core/legacy/legacy_well_core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ def current_liquid_height(self) -> float:
129129
"""Get the current liquid height."""
130130
return 0.0
131131

132-
def get_well_volume(self) -> float:
132+
def get_liquid_volume(self) -> float:
133133
"""Get the current well volume."""
134134
return 0.0
135135

api/src/opentrons/protocol_api/core/well.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def current_liquid_height(self) -> float:
9595
"""Get the current liquid height."""
9696

9797
@abstractmethod
98-
def get_well_volume(self) -> float:
98+
def get_liquid_volume(self) -> float:
9999
"""Get the current volume within a well."""
100100

101101

api/src/opentrons/protocol_api/labware.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,9 @@ def current_liquid_height(self) -> float:
309309
return self._core.current_liquid_height()
310310

311311
@requires_version(2, 21)
312-
def current_well_volume(self) -> float:
312+
def current_liquid_volume(self) -> float:
313313
"""Get the current liquid volume in a well."""
314-
return self._core.get_well_volume()
314+
return self._core.get_liquid_volume()
315315

316316
@requires_version(2, 21)
317317
def estimate_liquid_height_after_pipetting(self, operation_volume: float) -> float:

api/tests/opentrons/protocol_api/core/engine/test_well_core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def test_current_liquid_volume(
269269
labware_id="labware-id", well_name="well-name"
270270
)
271271
).then_return(fake_volume)
272-
assert subject.get_well_volume() == fake_volume
272+
assert subject.get_liquid_volume() == fake_volume
273273

274274
# make sure that WellCore propagates a LiquidVolumeUnknownError
275275
decoy.when(
@@ -279,7 +279,7 @@ def test_current_liquid_volume(
279279
).then_raise(LiquidVolumeUnknownError())
280280

281281
with pytest.raises(LiquidVolumeUnknownError):
282-
subject.get_well_volume()
282+
subject.get_liquid_volume()
283283

284284

285285
@pytest.mark.parametrize("operation_volume", [0.0, 100, -100, 2, -4, 5])

0 commit comments

Comments
 (0)