Update enums with tuple members, regen (#1982)

packages/types/src/augment/registry.ts

@@ -5,7 +5,7 @@ import { Compact, Option, Raw, Vec } from '@polkadot/types/codec';
 import { BitVec, Bytes, Data, Null, StorageKey, Text, Type, U256, Unconstructable, bool, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types/primitive';
 import { BlockAttestations, IncludedBlocks, MoreAttestations } from '@polkadot/types/interfaces/attestations';
 import { RawAuraPreDigest } from '@polkadot/types/interfaces/aura';
-import { InclusionHeight, Uncle, UncleEntryItem } from '@polkadot/types/interfaces/authorship';
+import { UncleEntryItem } from '@polkadot/types/interfaces/authorship';
 import { BabeAuthorityWeight, BabeBlockWeight, BabeWeight, MaybeVrf, RawBabePreDigest, RawBabePreDigestCompat, RawBabePreDigestPrimary, RawBabePreDigestPrimaryTo159, RawBabePreDigestSecondary, RawBabePreDigestSecondaryTo159, RawBabePreDigestTo159, SlotNumber, VrfData, VrfProof } from '@polkadot/types/interfaces/babe';
 import { AccountData, BalanceLock, BalanceLockTo212, Reasons, VestingSchedule, WithdrawReasons } from '@polkadot/types/interfaces/balances';
 import { EthereumAddress } from '@polkadot/types/interfaces/claims';
@@ -28,7 +28,7 @@ import { ActiveRecovery, RecoveryConfig } from '@polkadot/types/interfaces/recov
 import { ApiId, BlockHash, ChainProperties, ExtrinsicOrHash, ExtrinsicStatus, Health, KeyValueOption, NetworkState, NetworkStatePeerset, NetworkStatePeersetInfo, NotConnectedPeer, Peer, PeerEndpoint, PeerEndpointAddr, PeerInfo, PeerPing, RpcMethods, RuntimeDispatchInfo, RuntimeVersion, RuntimeVersionApi, StorageChangeSet } from '@polkadot/types/interfaces/rpc';
 import { AccountId, AccountIdOf, AccountIndex, Address, AssetId, Balance, BalanceOf, Block, BlockNumber, Call, ChangesTrieConfiguration, Consensus, ConsensusEngineId, Digest, DigestItem, DispatchClass, DispatchInfo, DispatchInfoTo190, Fixed64, H160, H256, H512, Hash, Header, Index, Justification, KeyTypeId, KeyValue, LockIdentifier, LookupSource, LookupTarget, Moment, Origin, Perbill, Percent, Permill, Perquintill, Phantom, PhantomData, PreRuntime, Seal, SealV0, SignedBlock, StorageData, ValidatorId, Weight, WeightMultiplier } from '@polkadot/types/interfaces/runtime';
 import { FullIdentification, IdentificationTuple, Keys, SessionIndex, SessionKeys1, SessionKeys2, SessionKeys3, SessionKeys4, SessionKeys5, SessionKeys6 } from '@polkadot/types/interfaces/session';
-import { Bid, BidKind, BidKindVouch, SocietyJudgement, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces/society';
+import { Bid, BidKind, SocietyJudgement, SocietyVote, StrikeCount, VouchingStatus } from '@polkadot/types/interfaces/society';
 import { CompactAssignments, CompactScore, ElectionCompute, ElectionResult, ElectionStatus, EraIndex, EraPoints, EraRewardPoints, EraRewards, Exposure, Forcing, IndividualExposure, KeyType, MomentOf, Nominations, PhragmenScore, Points, RewardDestination, RewardPoint, SlashJournalEntry, SlashingSpans, SlashingSpansTo204, SpanIndex, SpanRecord, StakingLedger, StakingLedgerNew, StakingLedgerTo223, UnappliedSlash, UnappliedSlashOther, UnlockChunk, ValidatorIndex, ValidatorPrefs, ValidatorPrefsTo145, ValidatorPrefsTo196 } from '@polkadot/types/interfaces/staking';
 import { AccountInfo, DigestOf, DispatchError, DispatchErrorModule, DispatchErrorTo198, DispatchResult, DispatchResultOf, DispatchResultTo198, Event, EventId, EventIndex, EventRecord, EventRecordTo76, Key, Phase, RefCount } from '@polkadot/types/interfaces/system';
 import { OpenTip, OpenTipFinder, OpenTipTip, TreasuryProposal } from '@polkadot/types/interfaces/treasury';
@@ -270,12 +270,6 @@ declare module '@polkadot/types/types/registry' {
     Consensus: Consensus;
     'Option<Consensus>': Option<Consensus>;
     'Vec<Consensus>': Vec<Consensus>;
-    InclusionHeight: InclusionHeight;
-    'Option<InclusionHeight>': Option<InclusionHeight>;
-    'Vec<InclusionHeight>': Vec<InclusionHeight>;
-    Uncle: Uncle;
-    'Option<Uncle>': Option<Uncle>;
-    'Vec<Uncle>': Vec<Uncle>;
     UncleEntryItem: UncleEntryItem;
     'Option<UncleEntryItem>': Option<UncleEntryItem>;
     'Vec<UncleEntryItem>': Vec<UncleEntryItem>;
@@ -681,9 +675,6 @@ declare module '@polkadot/types/types/registry' {
     Bid: Bid;
     'Option<Bid>': Option<Bid>;
     'Vec<Bid>': Vec<Bid>;
-    BidKindVouch: BidKindVouch;
-    'Option<BidKindVouch>': Option<BidKindVouch>;
-    'Vec<BidKindVouch>': Vec<BidKindVouch>;
     BidKind: BidKind;
     'Option<BidKind>': Option<BidKind>;
     'Vec<BidKind>': Vec<BidKind>;

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

@@ -4,12 +4,10 @@
 
 export default {
   types: {
-    InclusionHeight: 'BlockNumber',
-    Uncle: '(Hash, Option<AccountId>)',
     UncleEntryItem: {
       _enum: {
-        InclusionHeight: 'InclusionHeight',
-        Uncle: 'Uncle'
+        InclusionHeight: 'BlockNumber',
+        Uncle: '(Hash, Option<AccountId>)'
       }
     }
   }

packages/types/src/interfaces/authorship/types.ts

@@ -5,16 +5,10 @@ import { ITuple } from '@polkadot/types/types';
 import { Enum, Option } from '@polkadot/types/codec';
 import { AccountId, BlockNumber, Hash } from '@polkadot/types/interfaces/runtime';
 
-/** @name InclusionHeight */
-export interface InclusionHeight extends BlockNumber {}
-
-/** @name Uncle */
-export interface Uncle extends ITuple<[Hash, Option<AccountId>]> {}
-
 /** @name UncleEntryItem */
 export interface UncleEntryItem extends Enum {
   readonly isInclusionHeight: boolean;
-  readonly asInclusionHeight: InclusionHeight;
+  readonly asInclusionHeight: BlockNumber;
   readonly isUncle: boolean;
-  readonly asUncle: Uncle;
+  readonly asUncle: ITuple<[Hash, Option<AccountId>]>;
 }

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

@@ -9,11 +9,10 @@ export default {
       kind: 'BidKind',
       value: 'Balance'
     },
-    BidKindVouch: '(AccountId, Balance)',
     BidKind: {
       _enum: {
         Deposit: 'Balance',
-        Vouch: 'BidKindVouch'
+        Vouch: '(AccountId, Balance)'
       }
     },
     // a society-specific Judgement (not the same as identity Judgement)

packages/types/src/interfaces/society/types.ts

@@ -18,12 +18,9 @@ export interface BidKind extends Enum {
   readonly isDeposit: boolean;
   readonly asDeposit: Balance;
   readonly isVouch: boolean;
-  readonly asVouch: BidKindVouch;
+  readonly asVouch: ITuple<[AccountId, Balance]>;
 }
 
-/** @name BidKindVouch */
-export interface BidKindVouch extends ITuple<[AccountId, Balance]> {}
-
 /** @name SocietyJudgement */
 export interface SocietyJudgement extends Enum {
   readonly isRebid: boolean;