Use Result<.., ...> instead of specific enum (#4895)

packages/types/src/interfaces/contracts/definitions.ts

@@ -34,12 +34,7 @@ export default {
       code: 'Bytes',
       storageDepositLimit: 'Option<Balance>'
     },
-    CodeUploadResult: {
-      _enum: {
-        Ok: 'CodeUploadResultValue',
-        Err: 'Null'
-      }
-    },
+    CodeUploadResult: 'Result<CodeUploadResultValue, DispatchError>',
     CodeUploadResultValue: {
       codeHash: 'CodeHash',
       deposit: 'Balance'
@@ -77,12 +72,7 @@ export default {
       flags: 'ContractReturnFlags',
       data: 'Bytes'
     },
-    ContractExecResultResult: {
-      _enum: {
-        Ok: 'ContractExecResultOk',
-        Err: 'DispatchError'
-      }
-    },
+    ContractExecResultResult: 'Result<ContractExecResultOk, DispatchError>',
     ContractExecResultTo267: {
       gasConsumed: 'u64',
       debugMessage: 'Text',
@@ -255,19 +245,8 @@ export default {
       data: 'Bytes',
       salt: 'Bytes'
     },
-    ContractInstantiateResultTo267: {
-      _enum: {
-        Ok: 'InstantiateReturnValueTo267',
-        Err: 'Null'
-      }
-    },
-    ContractInstantiateResultTo299: {
-      _enum: {
-        Ok: 'InstantiateReturnValue',
-        Err: 'Null'
-      },
-      _fallback: 'ContractInstantiateResultTo267'
-    },
+    ContractInstantiateResultTo267: 'Result<InstantiateReturnValueTo267, Null>',
+    ContractInstantiateResultTo299: 'Result<InstantiateReturnValueOk, Null>',
     ContractInstantiateResult: {
       _fallback: 'ContractInstantiateResultTo299',
       gasConsumed: 'u64',
@@ -285,12 +264,7 @@ export default {
       result: 'ExecReturnValue',
       accountId: 'AccountId'
     },
-    InstantiateReturnValue: {
-      _enum: {
-        Ok: 'InstantiateReturnValueOk',
-        Err: 'DispatchError'
-      }
-    },
+    InstantiateReturnValue: 'Result<InstantiateReturnValueOk, DispatchError>',
     InstructionWeights: {
       i64const: 'u32',
       i64load: 'u32',

packages/types/src/interfaces/contracts/types.ts

@@ -1,7 +1,7 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
-import type { Bytes, Compact, Enum, Null, Option, Raw, Set, Struct, Text, U8aFixed, bool, u32, u64, u8 } from '@polkadot/types-codec';
+import type { Bytes, Compact, Enum, Null, Option, Raw, Result, Set, Struct, Text, U8aFixed, bool, u32, u64, u8 } from '@polkadot/types-codec';
 import type { AccountId, Balance, BlockNumber, Hash, Weight } from '@polkadot/types/interfaces/runtime';
 import type { DispatchError } from '@polkadot/types/interfaces/system';
 
@@ -38,11 +38,15 @@ export interface CodeUploadRequest extends Struct {
 }
 
 /** @name CodeUploadResult */
-export interface CodeUploadResult extends Enum {
+export interface CodeUploadResult extends Result<CodeUploadResultValue, DispatchError> {
+  readonly isErr: boolean;
+  readonly asErr: DispatchError;
+  /** @deprecated Use isErr */
+  readonly isError: boolean;
+  /** @deprecated Use asErr */
+  readonly asError: DispatchError;
   readonly isOk: boolean;
   readonly asOk: CodeUploadResultValue;
-  readonly isErr: boolean;
-  readonly type: 'Ok' | 'Err';
 }
 
 /** @name CodeUploadResultValue */
@@ -85,12 +89,15 @@ export interface ContractExecResultOk extends Struct {
 }
 
 /** @name ContractExecResultResult */
-export interface ContractExecResultResult extends Enum {
-  readonly isOk: boolean;
-  readonly asOk: ContractExecResultOk;
+export interface ContractExecResultResult extends Result<ContractExecResultOk, DispatchError> {
   readonly isErr: boolean;
   readonly asErr: DispatchError;
-  readonly type: 'Ok' | 'Err';
+  /** @deprecated Use isErr */
+  readonly isError: boolean;
+  /** @deprecated Use asErr */
+  readonly asError: DispatchError;
+  readonly isOk: boolean;
+  readonly asOk: ContractExecResultOk;
 }
 
 /** @name ContractExecResultSuccessTo255 */
@@ -148,19 +155,21 @@ export interface ContractInstantiateResult extends Struct {
 }
 
 /** @name ContractInstantiateResultTo267 */
-export interface ContractInstantiateResultTo267 extends Enum {
+export interface ContractInstantiateResultTo267 extends Result<InstantiateReturnValueTo267, Null> {
+  readonly isErr: boolean;
+  /** @deprecated Use isErr */
+  readonly isError: boolean;
   readonly isOk: boolean;
   readonly asOk: InstantiateReturnValueTo267;
-  readonly isErr: boolean;
-  readonly type: 'Ok' | 'Err';
 }
 
 /** @name ContractInstantiateResultTo299 */
-export interface ContractInstantiateResultTo299 extends Enum {
-  readonly isOk: boolean;
-  readonly asOk: InstantiateReturnValue;
+export interface ContractInstantiateResultTo299 extends Result<InstantiateReturnValueOk, Null> {
   readonly isErr: boolean;
-  readonly type: 'Ok' | 'Err';
+  /** @deprecated Use isErr */
+  readonly isError: boolean;
+  readonly isOk: boolean;
+  readonly asOk: InstantiateReturnValueOk;
 }
 
 /** @name ContractReturnFlags */
@@ -324,12 +333,15 @@ export interface InstantiateRequestV2 extends Struct {
 }
 
 /** @name InstantiateReturnValue */
-export interface InstantiateReturnValue extends Enum {
-  readonly isOk: boolean;
-  readonly asOk: InstantiateReturnValueOk;
+export interface InstantiateReturnValue extends Result<InstantiateReturnValueOk, DispatchError> {
   readonly isErr: boolean;
   readonly asErr: DispatchError;
-  readonly type: 'Ok' | 'Err';
+  /** @deprecated Use isErr */
+  readonly isError: boolean;
+  /** @deprecated Use asErr */
+  readonly asError: DispatchError;
+  readonly isOk: boolean;
+  readonly asOk: InstantiateReturnValueOk;
 }
 
 /** @name InstantiateReturnValueOk */