use "error" when type is Error

This renames "err" to "error" when the type is Error for consistency
(fixes redux complaints about non-serializable err).
This commit is contained in:
David Lechner
2022-10-17 13:44:21 -05:00
committed by David Lechner
parent 186fd4cd71
commit e67ae1c52b
10 changed files with 42 additions and 38 deletions
+9 -9
View File
@@ -63,10 +63,10 @@ function didFailToConnectCreator(
function didFailToConnectCreator(
reason: BootloaderConnectionFailureReason.Unknown,
err: Error,
error: Error,
): Action<typeof didFailToConnectType> & {
reason: BootloaderConnectionFailureReason.Unknown;
err: Error;
error: Error;
};
function didFailToConnectCreator<T extends BootloaderConnectionFailureReason>(
@@ -103,9 +103,9 @@ export const didFailToConnect = createAction(didFailToConnectCreator);
/**
* There was a connection error.
*/
export const didError = createAction((err: Error) => ({
export const didError = createAction((error: Error) => ({
type: 'bootloader.action.connection.didError',
err,
error,
}));
/**
@@ -127,9 +127,9 @@ export const didSend = createAction(() => ({
/**
* Sending a message failed with error.
*/
export const didFailToSend = createAction((err: Error) => ({
export const didFailToSend = createAction((error: Error) => ({
type: 'bootloader.action.connection.didFailToSend',
err,
error,
}));
/**
@@ -249,12 +249,12 @@ export const didRequest = createAction((id: number) => ({
/**
* Creates an action that indicates a request failed to send.
* @param id The unique identifier of the action.
* @param err The error message.
* @param error The error message.
*/
export const didFailToRequest = createAction((id: number, err: Error) => ({
export const didFailToRequest = createAction((id: number, error: Error) => ({
type: 'bootloader.action.didFailToRequest',
id,
err,
error,
}));
// Bootloader response actions for receiving responses from the connection.
+2 -2
View File
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// Copyright (c) 2020,2022 The Pybricks Authors
// Copyright (c) 2020-2022 The Pybricks Authors
//
// Handles LEGO Wireless Protocol v3 Bootloader protocol.
@@ -121,7 +121,7 @@ function* encodeRequest(): Generator {
});
if (failedToSend) {
yield* put(didFailToRequest(action.id, failedToSend.err));
yield* put(didFailToRequest(action.id, failedToSend.error));
} else {
yield* put(didRequest(action.id));
}