git.delta.rocks / unique-network / refs/commits / 85f3ef2e0166

difftreelog

move types and interfaces to types.ts

Max Andreev2022-08-24parent: #a36e310.patch.diff
in: master

3 files changed

addedtests/src/util/playgrounds/types.tsdiffbeforeafterboth
--- /dev/null
+++ b/tests/src/util/playgrounds/types.ts
@@ -0,0 +1,130 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+import {IKeyringPair} from '@polkadot/types/types';
+
+export interface IChainEvent {
+  data: any;
+  method: string;
+  section: string;
+}
+
+export interface ITransactionResult {
+    status: 'Fail' | 'Success';
+    result: {
+        events: {
+          event: IChainEvent
+        }[];
+    },
+    moduleError?: string;
+}
+
+export interface ILogger {
+  log: (msg: any, level?: string) => void;
+  level: {
+    ERROR: 'ERROR';
+    WARNING: 'WARNING';
+    INFO: 'INFO';
+    [key: string]: string;
+  }
+}
+
+export interface IUniqueHelperLog {
+  executedAt: number;
+  executionTime: number;
+  type: 'extrinsic' | 'rpc';
+  status: 'Fail' | 'Success';
+  call: string;
+  params: any[];
+  moduleError?: string;
+  events?: any;
+}
+
+export interface IApiListeners {
+  connected?: (...args: any[]) => any;
+  disconnected?: (...args: any[]) => any;
+  error?: (...args: any[]) => any;
+  ready?: (...args: any[]) => any; 
+  decorated?: (...args: any[]) => any;
+}
+
+export interface ICrossAccountId {
+  Substrate?: TSubstrateAccount;
+  Ethereum?: TEthereumAccount;
+}
+
+export interface ICrossAccountIdLower {
+  substrate?: TSubstrateAccount;
+  ethereum?: TEthereumAccount;
+}
+
+export interface ICollectionLimits {
+  accountTokenOwnershipLimit?: number | null;
+  sponsoredDataSize?: number | null;
+  sponsoredDataRateLimit?: {blocks: number} | {sponsoringDisabled: null} | null;
+  tokenLimit?: number | null;
+  sponsorTransferTimeout?: number | null;
+  sponsorApproveTimeout?: number | null;
+  ownerCanTransfer?: boolean | null;
+  ownerCanDestroy?: boolean | null;
+  transfersEnabled?: boolean | null;
+}
+
+export interface INestingPermissions {
+  tokenOwner?: boolean;
+  collectionAdmin?: boolean;
+  restricted?: number[] | null;
+}
+
+export interface ICollectionPermissions {
+  access?: 'Normal' | 'AllowList';
+  mintMode?: boolean;
+  nesting?: INestingPermissions;
+}
+
+export interface IProperty {
+  key: string;
+  value: string;
+}
+
+export interface ITokenPropertyPermission {
+  key: string;
+  permission: {
+    mutable: boolean;
+    tokenOwner: boolean;
+    collectionAdmin: boolean;
+  }
+}
+
+export interface IToken {
+  collectionId: number;
+  tokenId: number;
+}
+
+export interface ICollectionCreationOptions {
+  name: string | number[];
+  description: string | number[];
+  tokenPrefix: string | number[];
+  mode?: {
+    nft?: null;
+    refungible?: null;
+    fungible?: number;
+  }
+  permissions?: ICollectionPermissions;
+  properties?: IProperty[];
+  tokenPropertyPermissions?: ITokenPropertyPermission[];
+  limits?: ICollectionLimits;
+  pendingSponsor?: TSubstrateAccount;
+}
+
+export interface IChainProperties {
+  ss58Format: number;
+  tokenDecimals: number[];
+  tokenSymbol: string[]
+}
+
+export type TSubstrateAccount = string;
+export type TEthereumAccount = string;
+export type TApiAllowedListeners = 'connected' | 'disconnected' | 'error' | 'ready' | 'decorated';
+export type TUniqueNetworks = 'opal' | 'quartz' | 'unique';
+export type TSigner = IKeyringPair; // | 'string'
\ No newline at end of file
modifiedtests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.dev.ts
+++ b/tests/src/util/playgrounds/unique.dev.ts
@@ -3,9 +3,9 @@
 
 import {mnemonicGenerate} from '@polkadot/util-crypto';
 import {UniqueHelper} from './unique';
-import {IKeyringPair} from '@polkadot/types/types';
 import {ApiPromise, WsProvider} from '@polkadot/api';
 import * as defs from '../../interfaces/definitions';
+import { TSigner } from './types';
 
 
 export class DevUniqueHelper extends UniqueHelper {
@@ -69,7 +69,7 @@
    * @returns array of newly created accounts
    * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor); 
    */
-  creteAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {
+  creteAccounts = async (balances: bigint[], donor: TSigner): Promise<TSigner[]> => {
     let nonce = await this.helper.chain.getNonce(donor.address);
     const tokenNominal = this.helper.balance.getOneTokenNominal();
     const transactions = [];
modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
9import {ApiInterfaceEvents} from '@polkadot/api/types';9import {ApiInterfaceEvents} from '@polkadot/api/types';
10import {IKeyringPair} from '@polkadot/types/types';10import {IKeyringPair} from '@polkadot/types/types';
11import {encodeAddress, decodeAddress, keccakAsHex, evmToAddress, addressToEvm} from '@polkadot/util-crypto';11import {encodeAddress, decodeAddress, keccakAsHex, evmToAddress, addressToEvm} from '@polkadot/util-crypto';
12import { ICrossAccountIdLower, ICrossAccountId, TUniqueNetworks, IApiListeners, TApiAllowedListeners, TSigner, TSubstrateAccount, ICollectionLimits, ICollectionPermissions, INestingPermissions, IProperty, ITokenPropertyPermission, ICollectionCreationOptions, IToken, IChainProperties, TEthereumAccount } from './types';
1213
1314
14const crossAccountIdFromLower = (lowerAddress: ICrossAccountIdLower): ICrossAccountId => {15const crossAccountIdFromLower = (lowerAddress: ICrossAccountIdLower): ICrossAccountId => {
82  events?: any;83  events?: any;
83}84}
84
85interface IApiListeners {
86  connected?: (...args: any[]) => any;
87  disconnected?: (...args: any[]) => any;
88  error?: (...args: any[]) => any;
89  ready?: (...args: any[]) => any; 
90  decorated?: (...args: any[]) => any;
91}
92
93interface ICrossAccountId {
94  Substrate?: TSubstrateAccount;
95  Ethereum?: TEthereumAccount;
96}
97
98interface ICrossAccountIdLower {
99  substrate?: TSubstrateAccount;
100  ethereum?: TEthereumAccount;
101}
102
103interface ICollectionLimits {
104  accountTokenOwnershipLimit?: number | null;
105  sponsoredDataSize?: number | null;
106  sponsoredDataRateLimit?: {blocks: number} | {sponsoringDisabled: null} | null;
107  tokenLimit?: number | null;
108  sponsorTransferTimeout?: number | null;
109  sponsorApproveTimeout?: number | null;
110  ownerCanTransfer?: boolean | null;
111  ownerCanDestroy?: boolean | null;
112  transfersEnabled?: boolean | null;
113}
114
115interface INestingPermissions {
116  tokenOwner?: boolean;
117  collectionAdmin?: boolean;
118  restricted?: number[] | null;
119}
120
121interface ICollectionPermissions {
122  access?: 'Normal' | 'AllowList';
123  mintMode?: boolean;
124  nesting?: INestingPermissions;
125}
126
127interface IProperty {
128  key: string;
129  value: string;
130}
131
132interface ITokenPropertyPermission {
133  key: string;
134  permission: {
135    mutable: boolean;
136    tokenOwner: boolean;
137    collectionAdmin: boolean;
138  }
139}
140
141interface IToken {
142  collectionId: number;
143  tokenId: number;
144}
145
146interface ICollectionCreationOptions {
147  name: string | number[];
148  description: string | number[];
149  tokenPrefix: string | number[];
150  mode?: {
151    nft?: null;
152    refungible?: null;
153    fungible?: number;
154  }
155  permissions?: ICollectionPermissions;
156  properties?: IProperty[];
157  tokenPropertyPermissions?: ITokenPropertyPermission[];
158  limits?: ICollectionLimits;
159  pendingSponsor?: TSubstrateAccount;
160}
161
162interface IChainProperties {
163  ss58Format: number;
164  tokenDecimals: number[];
165  tokenSymbol: string[]
166}
167
168type TSubstrateAccount = string;
169type TEthereumAccount = string;
170type TApiAllowedListeners = 'connected' | 'disconnected' | 'error' | 'ready' | 'decorated';
171type TUniqueNetworks = 'opal' | 'quartz' | 'unique';
172type TSigner = IKeyringPair; // | 'string'
17385
174class UniqueUtil {86class UniqueUtil {
175  static transactionStatus = {87  static transactionStatus = {