From fc45bed41304b657d4cb98697fb0131de280dd33 Mon Sep 17 00:00:00 2001 From: Igor Kozyrev Date: Mon, 06 Dec 2021 09:48:27 +0000 Subject: [PATCH] temporary disable inflation pallet --- --- a/Cargo.lock +++ b/Cargo.lock @@ -11690,7 +11690,6 @@ "pallet-evm-migration", "pallet-evm-transaction-payment", "pallet-fungible", - "pallet-inflation", "pallet-nonfungible", "pallet-randomness-collective-flip", "pallet-refungible", --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -33,7 +33,7 @@ 'pallet-refungible/runtime-benchmarks', 'pallet-nonfungible/runtime-benchmarks', 'pallet-unique/runtime-benchmarks', - 'pallet-inflation/runtime-benchmarks', +# 'pallet-inflation/runtime-benchmarks', 'pallet-xcm/runtime-benchmarks', 'sp-runtime/runtime-benchmarks', 'xcm-builder/runtime-benchmarks', @@ -75,7 +75,7 @@ 'fp-self-contained/std', 'parachain-info/std', 'serde', - 'pallet-inflation/std', +# 'pallet-inflation/std', 'pallet-common/std', 'pallet-fungible/std', 'pallet-refungible/std', @@ -379,7 +379,7 @@ pallet-unique = { path = '../pallets/unique', default-features = false } up-rpc = { path = "../primitives/rpc", default-features = false } up-evm-mapping = { path = "../primitives/evm-mapping", default-features = false } -pallet-inflation = { path = '../pallets/inflation', default-features = false } +# pallet-inflation = { path = '../pallets/inflation', default-features = false } up-data-structs = { path = '../primitives/data-structs', default-features = false } pallet-common = { default-features = false, path = "../pallets/common" } pallet-fungible = { default-features = false, path = "../pallets/fungible" } --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -784,17 +784,17 @@ type Event = Event; type WeightInfo = pallet_unique::weights::SubstrateWeight; } - +/* parameter_types! { pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied -} +} */ /// Used for the pallet inflation -impl pallet_inflation::Config for Runtime { +/* impl pallet_inflation::Config for Runtime { type Currency = Balances; type TreasuryAccountId = TreasuryAccountId; type InflationBlockInterval = InflationBlockInterval; -} +} */ // parameter_types! { // pub MaximumSchedulerWeight: Weight = Perbill::from_percent(50) * @@ -881,7 +881,7 @@ DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 53, // Unique Pallets - Inflation: pallet_inflation::{Pallet, Call, Storage} = 60, + // Inflation: pallet_inflation::{Pallet, Call, Storage} = 60, Unique: pallet_unique::{Pallet, Call, Storage, Event} = 61, // Scheduler: pallet_unq_scheduler::{Pallet, Call, Storage, Event} = 62, // free = 63 @@ -1366,7 +1366,7 @@ list_benchmark!(list, extra, pallet_evm_migration, EvmMigration); list_benchmark!(list, extra, pallet_unique, Unique); - list_benchmark!(list, extra, pallet_inflation, Inflation); + //list_benchmark!(list, extra, pallet_inflation, Inflation); list_benchmark!(list, extra, pallet_fungible, Fungible); list_benchmark!(list, extra, pallet_refungible, Refungible); list_benchmark!(list, extra, pallet_nonfungible, Nonfungible); @@ -1400,7 +1400,7 @@ add_benchmark!(params, batches, pallet_evm_migration, EvmMigration); add_benchmark!(params, batches, pallet_unique, Unique); - add_benchmark!(params, batches, pallet_inflation, Inflation); + //add_benchmark!(params, batches, pallet_inflation, Inflation); add_benchmark!(params, batches, pallet_fungible, Fungible); add_benchmark!(params, batches, pallet_refungible, Refungible); add_benchmark!(params, batches, pallet_nonfungible, Nonfungible); --- a/tests/src/creditFeesToTreasury.test.ts +++ b/tests/src/creditFeesToTreasury.test.ts @@ -34,7 +34,7 @@ // Skip the inflation block pauses if the block is close to inflation block // until the inflation happens /*eslint no-async-promise-executor: "off"*/ -function skipInflationBlock(api: ApiPromise): Promise { +/*function skipInflationBlock(api: ApiPromise): Promise { const promise = new Promise(async (resolve) => { const blockInterval = (await api.consts.inflation.inflationBlockInterval).toNumber(); const unsubscribe = await api.rpc.chain.subscribeNewHeads(head => { @@ -49,7 +49,7 @@ }); return promise; -} +}*/ describe('integration test: Fees must be credited to Treasury:', () => { before(async () => { @@ -61,7 +61,7 @@ it('Total issuance does not change', async () => { await usingApi(async (api) => { - await skipInflationBlock(api); + //await skipInflationBlock(api); await waitNewBlocks(api, 1); const totalBefore = (await api.query.balances.totalIssuance()).toBigInt(); @@ -81,7 +81,7 @@ it('Sender balance decreased by fee+sent amount, Treasury balance increased by fee', async () => { await usingApi(async (api) => { - await skipInflationBlock(api); + //await skipInflationBlock(api); await waitNewBlocks(api, 1); const alicePrivateKey = privateKey('//Alice'); @@ -104,7 +104,7 @@ it('Treasury balance increased by failed tx fee', async () => { await usingApi(async (api) => { - await skipInflationBlock(api); + //await skipInflationBlock(api); await waitNewBlocks(api, 1); const bobPrivateKey = privateKey('//Bob'); @@ -125,7 +125,7 @@ it('NFT Transactions also send fees to Treasury', async () => { await usingApi(async (api) => { - await skipInflationBlock(api); + //await skipInflationBlock(api); await waitNewBlocks(api, 1); const treasuryBalanceBefore = (await api.query.system.account(TREASURY)).data.free.toBigInt(); @@ -144,7 +144,7 @@ it('Fees are sane', async () => { await usingApi(async (api) => { - await skipInflationBlock(api); + //await skipInflationBlock(api); await waitNewBlocks(api, 1); const aliceBalanceBefore: bigint = (await api.query.system.account(alicesPublicKey)).data.free.toBigInt(); @@ -161,7 +161,7 @@ it('NFT Transfer fee is close to 0.1 Unique', async () => { await usingApi(async (api) => { - await skipInflationBlock(api); + //await skipInflationBlock(api); await waitNewBlocks(api, 1); const collectionId = await createCollectionExpectSuccess(); --- a/tests/src/inflation.test.ts +++ b/tests/src/inflation.test.ts @@ -10,7 +10,7 @@ chai.use(chaiAsPromised); const expect = chai.expect; -describe('integration test: Inflation', () => { +describe.skip('integration test: Inflation', () => { it('First year inflation is 10%', async () => { await usingApi(async (api) => { --- a/tests/src/pallet-presence.test.ts +++ b/tests/src/pallet-presence.test.ts @@ -34,7 +34,7 @@ 'polkadotxcm', 'cumulusxcm', 'dmpqueue', - 'inflation', + //'inflation', 'unique', 'nonfungible', 'refungible', --- a/tests/src/setOffchainSchema.test.ts +++ b/tests/src/setOffchainSchema.test.ts @@ -84,7 +84,7 @@ await setOffchainSchemaExpectFailure(alice, destroyedCollectionId, DATA); }); - it.only('fails on too long data', async () => { + it('fails on too long data', async () => { const tooLongData = new Array(8 * 1024 + 10).fill(0xff); await setOffchainSchemaExpectFailure(alice, validCollectionId, tooLongData); -- gitstuff