.

Author: ddcc4

api/src/opentrons/legacy_commands/publisher.py

@@ -31,7 +31,7 @@ def broker(self, broker: LegacyBroker) -> None:
         """Set the publisher's Broker."""
         self._broker = broker
 
-
+c
 CommandPayloadCreator = Callable[..., CommandPayload]
 """A function that creates a Command dictionary message."""
 

step-generation/src/__tests__/consolidate.test.ts

@@ -140,6 +140,7 @@ describe('consolidate single-channel', () => {
           name: 'wasteChute',
           id: 'wasteChuteId',
           location: 'cutoutD3',
+          pythonName: 'mock_waste_chute',
         },
       },
     }
@@ -618,6 +619,7 @@ describe('consolidate single-channel', () => {
           name: 'trashBin',
           id: 'trashBinId',
           location: 'cutoutA3',
+          pythonName: 'mock_trash_bin',
         },
       },
     }
@@ -1156,6 +1158,7 @@ describe('consolidate single-channel', () => {
             name: 'trashBin',
             id: 'trashBinId',
             location: 'cutoutA3',
+            pythonName: 'mock_trash_bin',
           },
         },
       }

step-generation/src/commandCreators/atomic/moveLabware.ts

@@ -30,6 +30,7 @@ import type {
   CommandCreator,
   CommandCreatorError,
   CommandCreatorWarning,
+  TrashBinEntity,
 } from '../../types'
 
 /** Move labware from one location to another, manually or via a gripper. */
@@ -270,18 +271,17 @@ export const moveLabware: CommandCreator<MoveLabwareParams> = (
     const matchingTrashCutoutId = trashCutoutIds.find(
       cutoutId => cutoutId === cutoutIdFromAddressableAreaName
     )
-    const matchingTrashId =
-      matchingTrashCutoutId != null
-        ? Object.values(additionalEquipmentEntities).find(
-            ae =>
-              ae.name === 'trashBin' && ae.location === matchingTrashCutoutId
-          )?.id
-        : null
+    const matchingTrashBinEntity: TrashBinEntity | undefined = Object.values(
+      additionalEquipmentEntities
+    ).find(
+      ae => ae.name === 'trashBin' && ae.location === matchingTrashCutoutId
+    )
+    const matchingTrashId = matchingTrashBinEntity?.id
 
     if (is4thColumnSlot) {
       location = formatPyStr(newLocation.addressableAreaName)
     } else if (matchingTrashId != null && !isWasteChuteLocation) {
-      location = additionalEquipmentEntities[matchingTrashId]?.pythonName ?? ''
+      location = matchingTrashBinEntity?.pythonName ?? ''
     } else if (matchingTrashId == null && isWasteChuteLocation) {
       location =
         Object.values(additionalEquipmentEntities).find(