From 6c1065a66823d137058deced254c4954fd5f9949 Mon Sep 17 00:00:00 2001 From: Greg Zaitsev Date: Tue, 27 Jul 2021 15:22:41 +0000 Subject: [PATCH] Code style and format --- --- 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::::TransferNotAllowed - ); + ensure!(collection.transfers_enabled, Error::::TransferNotAllowed); Ok(()) } --- 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()); --- 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; --- 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; --- 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); --- 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', () => { --- 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); --- 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); --- a/tests/src/substrate/substrate-api.ts +++ b/tests/src/substrate/substrate-api.ts @@ -48,12 +48,12 @@ console.warn = outFn; try { - await promisifySubstrate(api, async () => { + await promisifySubstrate(api, async () => { if (api) { await api.isReadyOrError; result = await action(api); } - })(); + })(); } finally { await api.disconnect(); console.error = consoleErr; --- 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); -- gitstuff