fix rebse

Opentrons · Jan 27, 2025 · f8b1387 · f8b1387
1 parent 5ac55ce
commit f8b1387
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 42 deletions.
diff --git a/step-generation/src/__tests__/aspirate.test.ts b/step-generation/src/__tests__/aspirate.test.ts
@@ -11,7 +11,6 @@ import {
 } from '@opentrons/shared-data'
 
 import {
-  absorbanceReaderCollision,
   pipetteIntoHeaterShakerLatchOpen,
   thermocyclerPipetteCollision,
   pipetteIntoHeaterShakerWhileShaking,
@@ -273,41 +272,6 @@ describe('aspirate', () => {
       type: 'THERMOCYCLER_LID_CLOSED',
     })
   })
-  it('should return an error when aspirating from absorbance with pipette collision', () => {
-    vi.mocked(absorbanceReaderCollision).mockImplementationOnce(
-      (
-        modules: RobotState['modules'],
-        labware: RobotState['labware'],
-        labwareId: string
-      ) => {
-        expect(modules).toBe(robotStateWithTip.modules)
-        expect(labware).toBe(robotStateWithTip.labware)
-        expect(labwareId).toBe(SOURCE_LABWARE)
-        return true
-      }
-    )
-    const result = aspirate(
-      {
-        ...({
-          ...flowRateAndOffsets,
-          pipette: DEFAULT_PIPETTE,
-          volume: 50,
-          labware: SOURCE_LABWARE,
-          well: 'A1',
-        } as AspDispAirgapParams),
-        tipRack: 'tipRack',
-        xOffset: 0,
-        yOffset: 0,
-        nozzles: null,
-      },
-      invariantContext,
-      robotStateWithTip
-    )
-    expect(getErrorResult(result).errors).toHaveLength(1)
-    expect(getErrorResult(result).errors[0]).toMatchObject({
-      type: 'ABSORBANCE_READER_LID_CLOSED',
-    })
-  })
   it('should return an error when aspirating from heaterShaker with latch opened', () => {
     vi.mocked(pipetteIntoHeaterShakerLatchOpen).mockImplementationOnce(
       (

diff --git a/step-generation/src/__tests__/moveToWell.test.ts b/step-generation/src/__tests__/moveToWell.test.ts
@@ -207,9 +207,9 @@ describe('moveToWell', () => {
     )
     const result = moveToWell(
       {
-        pipette: DEFAULT_PIPETTE,
-        labware: SOURCE_LABWARE,
-        well: 'A1',
+        pipetteId: DEFAULT_PIPETTE,
+        labwareId: SOURCE_LABWARE,
+        wellName: 'A1',
       },
       invariantContext,
       robotStateWithTip

diff --git a/step-generation/src/commandCreators/atomic/aspirate.ts b/step-generation/src/commandCreators/atomic/aspirate.ts
@@ -144,7 +144,7 @@ export const aspirate: CommandCreator<ExtendedAspirateParams> = (
     absorbanceReaderCollision(
       prevRobotState.modules,
       prevRobotState.labware,
-      labware
+      labwareId
     )
   ) {
     errors.push(errorCreators.absorbanceReaderLidClosed())

diff --git a/step-generation/src/commandCreators/atomic/dispense.ts b/step-generation/src/commandCreators/atomic/dispense.ts
@@ -143,7 +143,7 @@ export const dispense: CommandCreator<DispenseAtomicCommandParams> = (
     absorbanceReaderCollision(
       prevRobotState.modules,
       prevRobotState.labware,
-      labware
+      labwareId
     )
   ) {
     errors.push(errorCreators.absorbanceReaderLidClosed())

diff --git a/step-generation/src/commandCreators/atomic/moveToWell.ts b/step-generation/src/commandCreators/atomic/moveToWell.ts
@@ -114,7 +114,7 @@ export const moveToWell: CommandCreator<MoveToWellParams> = (
     absorbanceReaderCollision(
       prevRobotState.modules,
       prevRobotState.labware,
-      labware
+      labwareId
     )
   ) {
     errors.push(errorCreators.absorbanceReaderLidClosed())