fix(protobuf): clean up type of backup_type in schema

trezor · Apr 8, 2024 · 19b7bb2 · 19b7bb2
1 parent 7803da2
commit 19b7bb2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/packages/connect/src/api/resetDevice.ts b/packages/connect/src/api/resetDevice.ts
@@ -3,9 +3,8 @@
 import { AbstractMethod } from '../core/AbstractMethod';
 import { UI, createUiMessage } from '../events';
 import { getFirmwareRange } from './common/paramsValidator';
-import type { PROTO } from '../constants';
+import { PROTO } from '../constants';
 import { Assert } from '@trezor/schema-utils';
-import { ResetDevice as ResetDeviceSchema } from '../types/api/resetDevice';
 
 export default class ResetDevice extends AbstractMethod<'resetDevice', PROTO.ResetDevice> {
     confirmed?: boolean;
@@ -18,7 +17,7 @@ export default class ResetDevice extends AbstractMethod<'resetDevice', PROTO.Res
 
         const { payload } = this;
         // validate bundle type
-        Assert(ResetDeviceSchema, payload);
+        Assert(PROTO.ResetDevice, payload);
 
         this.params = {
             display_random: payload.display_random,

diff --git a/packages/connect/src/types/api/resetDevice.ts b/packages/connect/src/types/api/resetDevice.ts
@@ -2,16 +2,7 @@
  * Performs device setup and generates a new seed.
  */
 
-import { Static, Type } from '@trezor/schema-utils';
 import { PROTO } from '../../constants';
 import type { Params, Response } from '../params';
 
-export type ResetDevice = Static<typeof ResetDevice>;
-export const ResetDevice = Type.Composite([
-    PROTO.ResetDevice,
-    Type.Object({
-        backup_type: Type.Optional(Type.Union([Type.Literal(0), Type.Literal(1)])),
-    }),
-]);
-
-export declare function resetDevice(params: Params<ResetDevice>): Response<PROTO.Success>;
+export declare function resetDevice(params: Params<PROTO.ResetDevice>): Response<PROTO.Success>;
diff --git a/packages/protobuf/scripts/protobuf-patches/index.js b/packages/protobuf/scripts/protobuf-patches/index.js
@@ -169,7 +169,7 @@ const TYPE_PATCH = {
     'EosActionUnlinkAuth.type': 'string',
     'EosActionNewAccount.creator': 'string',
     'EosActionNewAccount.name': 'string',
-    'ResetDevice.backup_type': 'string | number', // BackupType is a enum. in Features displayed as string, in resetDevice method param accepted as number
+    'ResetDevice.backup_type': 'Enum_BackupType',
     'StellarAsset.type': '0 | 1 | 2  | "NATIVE" | "ALPHANUM4" | "ALPHANUM12"', // StellarAssetType is a enum, accepted as both number and string
     'StellarSignTx.sequence_number': UINT_TYPE,
     'StellarSignTx.memo_id': UINT_TYPE,

diff --git a/packages/protobuf/src/messages-schema.ts b/packages/protobuf/src/messages-schema.ts
@@ -2428,7 +2428,7 @@ export const ResetDevice = Type.Object(
         u2f_counter: Type.Optional(Type.Number()),
         skip_backup: Type.Optional(Type.Boolean()),
         no_backup: Type.Optional(Type.Boolean()),
-        backup_type: Type.Optional(Type.Union([Type.String(), Type.Number()])),
+        backup_type: Type.Optional(EnumEnum_BackupType),
     },
     { $id: 'ResetDevice' },
 );

diff --git a/packages/protobuf/src/messages.ts b/packages/protobuf/src/messages.ts
@@ -1729,7 +1729,7 @@ export type ResetDevice = {
     u2f_counter?: number;
     skip_backup?: boolean;
     no_backup?: boolean;
-    backup_type?: string | number;
+    backup_type?: Enum_BackupType;
 };
 
 // BackupDevice