git.delta.rocks / unique-network / refs/commits / 6c1065a66823

difftreelog

Code style and format

Greg Zaitsev2021-07-27parent: #793a35d.patch.diff
in: master

10 files changed

modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -946,7 +946,7 @@
 			let mut target_collection = Self::get_collection(collection_id)?;
 
 			Self::check_owner_permissions(&target_collection, &sender)?;
-			
+
 			target_collection.transfers_enabled = value;
 			Self::save_collection(target_collection);
 
@@ -1607,10 +1607,7 @@
 		);
 
 		// preliminary transfer check
-		ensure!(
-			collection.transfers_enabled,
-			Error::<T>::TransferNotAllowed
-		);
+		ensure!(collection.transfers_enabled, Error::<T>::TransferNotAllowed);
 
 		Ok(())
 	}
modifiedpallets/nft/src/tests.rsdiffbeforeafterboth
--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -2387,7 +2387,9 @@
 		let origin1 = Origin::signed(1);
 
 		let collection_id = create_test_collection(&CollectionMode::NFT, 1);
-		assert_ok!(TemplateModule::set_transfers_enabled_flag(origin1, 1, false));
+		assert_ok!(TemplateModule::set_transfers_enabled_flag(
+			origin1, 1, false
+		));
 
 		let data = default_nft_data();
 		create_test_item(collection_id, &data.into());
modifiedruntime/src/lib.rsdiffbeforeafterboth
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -154,7 +154,7 @@
 	transaction_version: 1,
 };
 
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
+pub const MILLISECS_PER_BLOCK: u64 = 1200;
 
 pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
 
modifiedtests/src/change-collection-owner.test.tsdiffbeforeafterboth
--- a/tests/src/change-collection-owner.test.ts
+++ b/tests/src/change-collection-owner.test.ts
@@ -7,7 +7,7 @@
 import chaiAsPromised from 'chai-as-promised';
 import privateKey from './substrate/privateKey';
 import { default as usingApi, submitTransactionAsync, submitTransactionExpectFailAsync } from './substrate/substrate-api';
-import { createCollectionExpectSuccess, normalizeAccountId } from './util/helpers';
+import { createCollectionExpectSuccess } from './util/helpers';
 
 chai.use(chaiAsPromised);
 const expect = chai.expect;
modifiedtests/src/enableDisableTransfer.test.tsdiffbeforeafterboth
--- a/tests/src/enableDisableTransfer.test.ts
+++ b/tests/src/enableDisableTransfer.test.ts
@@ -12,7 +12,7 @@
   createCollectionExpectSuccess,
   transferExpectSuccess,
   transferExpectFailure,
-  setTransferFlagExpectSuccess
+  setTransferFlagExpectSuccess,
 } from './util/helpers';
 
 chai.use(chaiAsPromised);
modifiedtests/src/pallet-presence.test.tsdiffbeforeafterboth
--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -32,14 +32,14 @@
   'nft',
   'scheduler',
   'nftpayment',
-  'charging'
+  'charging',
 ];
 
 // Pallets that depend on consensus and governance configuration
 const consensusPallets = [
   'sudo',
   'aura',
-  'auraext'
+  'auraext',
 ];
 
 describe('Pallet presence', () => {
modifiedtests/src/setConstOnChainSchema.test.tsdiffbeforeafterboth
--- a/tests/src/setConstOnChainSchema.test.ts
+++ b/tests/src/setConstOnChainSchema.test.ts
@@ -11,7 +11,6 @@
 import {
   createCollectionExpectSuccess,
   destroyCollectionExpectSuccess,
-  normalizeAccountId,
 } from './util/helpers';
 
 chai.use(chaiAsPromised);
modifiedtests/src/setVariableOnChainSchema.test.tsdiffbeforeafterboth
--- a/tests/src/setVariableOnChainSchema.test.ts
+++ b/tests/src/setVariableOnChainSchema.test.ts
@@ -11,7 +11,6 @@
 import {
   createCollectionExpectSuccess,
   destroyCollectionExpectSuccess,
-  normalizeAccountId,
 } from './util/helpers';
 
 chai.use(chaiAsPromised);
modifiedtests/src/substrate/substrate-api.tsdiffbeforeafterboth
before · tests/src/substrate/substrate-api.ts
1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56import { WsProvider, ApiPromise } from '@polkadot/api';7import { EventRecord } from '@polkadot/types/interfaces/system/types';8import { ExtrinsicStatus } from '@polkadot/types/interfaces/author/types';9import { IKeyringPair } from '@polkadot/types/types';1011import config from '../config';12import promisifySubstrate from './promisify-substrate';13import { ApiOptions, SubmittableExtrinsic, ApiTypes } from '@polkadot/api/types';14import rtt from '../../../runtime_types.json';1516function defaultApiOptions(): ApiOptions {17  const wsProvider = new WsProvider(config.substrateUrl);18  return {19    provider: wsProvider, types: rtt, signedExtensions: {20      ContractHelpers: {21        extrinsic: {},22        payload: {},23      },24    },25  };26}2728export default async function usingApi<T = void>(action: (api: ApiPromise) => Promise<T>, settings: ApiOptions | undefined = undefined): Promise<T> {29  settings = settings || defaultApiOptions();30  const api: ApiPromise = new ApiPromise(settings);31  let result: T = null as unknown as T;3233  // TODO: Remove, this is temporary: Filter unneeded API output 34  // (Jaco promised it will be removed in the next version)35  const consoleErr = console.error;36  const consoleLog = console.log;37  const consoleWarn = console.warn;3839  const outFn = (message: string) => {40    if (!message.includes('StorageChangeSet:: WebSocket is not connected') && 41        !message.includes('2021-') &&42        !message.includes('StorageChangeSet:: Normal connection closure'))43      consoleErr(message);44  };4546  console.error = outFn;47  console.log = outFn;48  console.warn = outFn;4950  try {51   await promisifySubstrate(api, async () => {52      if (api) {53        await api.isReadyOrError;54        result = await action(api);55      }56   })();57  } finally {58    await api.disconnect();59    console.error = consoleErr;60    console.log = consoleLog;61    console.warn = consoleWarn;62  }63  return result as T;64}6566enum TransactionStatus {67  Success,68  Fail,69  NotReady70}7172function getTransactionStatus(events: EventRecord[], status: ExtrinsicStatus): TransactionStatus {73  if (status.isReady) {74    return TransactionStatus.NotReady;75  }76  if (status.isBroadcast) {77    return TransactionStatus.NotReady;78  } 79  if (status.isInBlock || status.isFinalized) {80    if(events.filter(e => e.event.data.method === 'ExtrinsicFailed').length > 0) {81      return TransactionStatus.Fail;82    }83    if(events.filter(e => e.event.data.method === 'ExtrinsicSuccess').length > 0) {84      return TransactionStatus.Success;85    }86  }8788  return TransactionStatus.Fail;89}9091export function92submitTransactionAsync(sender: IKeyringPair, transaction: SubmittableExtrinsic<ApiTypes>): Promise<EventRecord[]> {93  /* eslint no-async-promise-executor: "off" */94  return new Promise(async (resolve, reject) => {95    try {96      await transaction.signAndSend(sender, ({ events = [], status }) => {97        const transactionStatus = getTransactionStatus(events, status);9899        if (transactionStatus === TransactionStatus.Success) {100          resolve(events);101        } else if (transactionStatus === TransactionStatus.Fail) {102          console.log(`Something went wrong with transaction. Status: ${status}`);103          reject(events);104        }105      });106    } catch (e) {107      console.log('Error: ', e);108      reject(e);109    }110  });111}112113export function submitTransactionExpectFailAsync(sender: IKeyringPair, transaction: SubmittableExtrinsic<ApiTypes>): Promise<EventRecord[]> {114  const consoleError = console.error;115  const consoleLog = console.log;116  console.error = () => {};117  console.log = () => {};118119  /* eslint no-async-promise-executor: "off" */120  return new Promise<EventRecord[]>(async function(res, rej) {121    const resolve = (rec: EventRecord[]) => {122      setTimeout(() => {123        res(rec);124        console.error = consoleError;125        console.log = consoleLog;126      });127    };128    const reject = (errror: any) => {129      setTimeout(() => {130        rej(errror);131        console.error = consoleError;132        console.log = consoleLog;133      });134    };135    try {136      await transaction.signAndSend(sender, ({ events = [], status }) => {137        const transactionStatus = getTransactionStatus(events, status);138139        // console.log('transactionStatus', transactionStatus, 'events', events);140141        if (transactionStatus === TransactionStatus.Success) {142          resolve(events);143        } else if (transactionStatus === TransactionStatus.Fail) {144          reject(events);145        }146      });147    } catch (e) {148      reject(e);149    }150  });151}
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -555,7 +555,7 @@
   });
 }
 
-export async function toggleContractWhitelistExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, value: boolean = true) {
+export async function toggleContractWhitelistExpectSuccess(sender: IKeyringPair, contractAddress: AccountId | string, value = true) {
   await usingApi(async (api) => {
     const tx = api.tx.nft.toggleContractWhiteList(contractAddress, value);
     const events = await submitTransactionAsync(sender, tx);
@@ -761,7 +761,7 @@
   recipient: IKeyringPair,
   value: number | bigint = 1,
   blockTimeMs: number,
-  blockSchedule: number
+  blockSchedule: number,
 ) {
   await usingApi(async (api: ApiPromise) => {
     const blockNumber: number | undefined = await getBlockNumber(api);