From 9d7845237c809ca31382583221ae5b6b77c266d9 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Wed, 20 Jan 2021 17:11:32 -0600 Subject: [PATCH] rename waitForDidSend to waitForDidRequest This better reflects what the function actually does. --- src/sagas/flash-firmware.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/sagas/flash-firmware.ts b/src/sagas/flash-firmware.ts index 85191478..ac90b02e 100644 --- a/src/sagas/flash-firmware.ts +++ b/src/sagas/flash-firmware.ts @@ -82,7 +82,7 @@ type WaitResponse = [ boolean, ]; -function* waitForDidSend(id: number): Generator { +function* waitForDidRequest(id: number): Generator { const didRequest = (yield take( (a: Action) => a.type === BootloaderDidRequestType && @@ -228,7 +228,7 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator { infoRequest(nextMessageId()), )) as BootloaderInfoRequestAction; const [, info] = (yield all([ - waitForDidSend(infoAction.id), + waitForDidRequest(infoAction.id), waitForResponse(BootloaderResponseActionType.Info), ])) as [BootloaderDidRequestAction, WaitResponse]; if (!info[0]) { @@ -258,7 +258,7 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator { const disconnectAction = (yield put( disconnectRequest(nextMessageId()), )) as BootloaderDisconnectRequestAction; - yield waitForDidSend(disconnectAction.id); + yield waitForDidRequest(disconnectAction.id); return; } @@ -278,7 +278,7 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator { eraseRequest(nextMessageId()), )) as BootloaderEraseRequestAction; const [, erase] = (yield all([ - waitForDidSend(eraseAction.id), + waitForDidRequest(eraseAction.id), waitForResponse(BootloaderResponseActionType.Erase, 5000), ])) as [BootloaderDidRequestAction, WaitResponse]; if (!erase[0] || erase[0].result) { @@ -290,7 +290,7 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator { initRequest(nextMessageId(), firmware.length), )) as BootloaderInitRequestAction; const [, init] = (yield all([ - waitForDidSend(initAction.id), + waitForDidRequest(initAction.id), waitForResponse(BootloaderResponseActionType.Init), ])) as [BootloaderDidRequestAction, WaitResponse]; if (!init[0] || init[0].result) { @@ -314,7 +314,7 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator { payload.buffer, ), )) as BootloaderProgramRequestAction; - yield waitForDidSend(programAction.id); + yield waitForDidRequest(programAction.id); yield put(didProgress(offset / firmware.length)); @@ -334,7 +334,7 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator { checksumRequest(nextMessageId()), )) as BootloaderChecksumRequestAction; const [, checksum] = (yield all([ - waitForDidSend(checksumAction.id), + waitForDidRequest(checksumAction.id), waitForResponse(BootloaderResponseActionType.Checksum, 5000), ])) as [ BootloaderDidRequestAction, @@ -365,7 +365,7 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator { const rebootAction = (yield put( rebootRequest(nextMessageId()), )) as BootloaderRebootRequestAction; - yield waitForDidSend(rebootAction.id); + yield waitForDidRequest(rebootAction.id); yield put(didFinish()); }