|
14 | 14 | from smpclient.mcuboot import IMAGE_TLV, ImageInfo, TLVNotFound
|
15 | 15 | from smpclient.requests.image_management import ImageStatesWrite
|
16 | 16 | from smpclient.requests.os_management import ResetWrite
|
17 |
| -from typing_extensions import Annotated |
| 17 | +from typing_extensions import Annotated, assert_never |
18 | 18 |
|
19 | 19 | from smpmgr import file_management, image_management, os_management, terminal
|
20 | 20 | from smpmgr.common import (
|
@@ -122,24 +122,30 @@ async def f() -> None:
|
122 | 122 | ImageStatesWrite(hash=image_tlv_sha256.value),
|
123 | 123 | "Marking uploaded image for test upgrade...",
|
124 | 124 | )
|
125 |
| - if error(image_states_response): |
| 125 | + if success(image_states_response): |
| 126 | + pass |
| 127 | + elif error(image_states_response): |
126 | 128 | print(image_states_response)
|
127 | 129 | raise typer.Exit(code=1)
|
128 |
| - elif success(image_states_response): |
129 |
| - pass |
130 | 130 | else:
|
131 |
| - raise Exception("Unreachable") |
| 131 | + assert_never(image_states_response) |
132 | 132 |
|
133 | 133 | reset_response = await smp_request(smpclient, options, ResetWrite())
|
134 |
| - if (error_v1(reset_response) and reset_response.rc != smperr.MGMT_ERR.EOK) or ( |
135 |
| - error_v2(reset_response) and reset_response.err.rc != OS_MGMT_RET_RC.OK |
136 |
| - ): |
137 |
| - print(reset_response) |
138 |
| - typer.Exit(code=1) |
139 |
| - elif success(reset_response): |
| 134 | + if success(reset_response): |
140 | 135 | pass
|
| 136 | + elif error(reset_response): |
| 137 | + if error_v1(reset_response): |
| 138 | + if reset_response.rc != smperr.MGMT_ERR.EOK: |
| 139 | + print(reset_response) |
| 140 | + raise typer.Exit(code=1) |
| 141 | + elif error_v2(reset_response): |
| 142 | + if reset_response.err.rc != OS_MGMT_RET_RC.OK: |
| 143 | + print(reset_response) |
| 144 | + raise typer.Exit(code=1) |
| 145 | + else: |
| 146 | + assert_never(reset_response) |
141 | 147 | else:
|
142 |
| - raise Exception("Unreachable") |
| 148 | + assert_never(reset_response) |
143 | 149 |
|
144 | 150 | print("Upgrade complete.")
|
145 | 151 |
|
|
0 commit comments