difftreelog
test fix build
in: master
9 files changed
pallets/collator-selection/src/mock.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original license:18// Copyright (C) 2021 Parity Technologies (UK) Ltd.19// SPDX-License-Identifier: Apache-2.02021// Licensed under the Apache License, Version 2.0 (the "License");22// you may not use this file except in compliance with the License.23// You may obtain a copy of the License at24//25// http://www.apache.org/licenses/LICENSE-2.026//27// Unless required by applicable law or agreed to in writing, software28// distributed under the License is distributed on an "AS IS" BASIS,29// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.30// See the License for the specific language governing permissions and31// limitations under the License.3233use frame_support::{34 ord_parameter_types, parameter_types,35 traits::{FindAuthor, GenesisBuild, ValidatorRegistration},36 PalletId,37};38use frame_system as system;39use frame_system::EnsureSignedBy;40use sp_core::H256;41use sp_runtime::{42 testing::{Header, UintAuthorityId},43 traits::{BlakeTwo256, IdentityLookup, OpaqueKeys},44 Perbill, RuntimeAppPublic,45};4647use super::*;48use crate as collator_selection;4950type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;51type Block = frame_system::mocking::MockBlock<Test>;5253// Configure a mock runtime to test the pallet.54frame_support::construct_runtime!(55 pub enum Test {56 System: frame_system,57 Timestamp: pallet_timestamp,58 Session: pallet_session,59 Aura: pallet_aura,60 Balances: pallet_balances,61 CollatorSelection: collator_selection,62 Authorship: pallet_authorship,63 }64);6566parameter_types! {67 pub const BlockHashCount: u64 = 250;68 pub const SS58Prefix: u8 = 42;69}7071impl system::Config for Test {72 type BaseCallFilter = frame_support::traits::Everything;73 type BlockWeights = ();74 type BlockLength = ();75 type DbWeight = ();76 type RuntimeOrigin = RuntimeOrigin;77 type RuntimeCall = RuntimeCall;78 type Nonce = u64;79 type Hash = H256;80 type Hashing = BlakeTwo256;81 type AccountId = u64;82 type Lookup = IdentityLookup<Self::AccountId>;83 type RuntimeEvent = RuntimeEvent;84 type BlockHashCount = BlockHashCount;85 type Version = ();86 type PalletInfo = PalletInfo;87 type AccountData = pallet_balances::AccountData<u64>;88 type OnNewAccount = ();89 type OnKilledAccount = ();90 type SystemWeightInfo = ();91 type SS58Prefix = SS58Prefix;92 type OnSetCode = ();93 type MaxConsumers = frame_support::traits::ConstU32<16>;94}9596parameter_types! {97 pub const ExistentialDeposit: u64 = 5;98 pub const MaxReserves: u32 = 50;99 pub const MaxHolds: u32 = 2;100 pub const MaxFreezes: u32 = 2;101}102103impl pallet_balances::Config for Test {104 type Balance = u64;105 type RuntimeEvent = RuntimeEvent;106 type DustRemoval = ();107 type ExistentialDeposit = ExistentialDeposit;108 type AccountStore = System;109 type WeightInfo = ();110 type MaxLocks = ();111 type MaxReserves = MaxReserves;112 type ReserveIdentifier = [u8; 8];113 type FreezeIdentifier = [u8; 16];114 type MaxHolds = MaxHolds;115 type MaxFreezes = MaxFreezes;116}117118pub struct Author4;119impl FindAuthor<u64> for Author4 {120 fn find_author<'a, I>(_digests: I) -> Option<u64>121 where122 I: 'a + IntoIterator<Item = (frame_support::ConsensusEngineId, &'a [u8])>,123 {124 Some(4)125 }126}127128impl pallet_authorship::Config for Test {129 type FindAuthor = Author4;130 type EventHandler = CollatorSelection;131}132133parameter_types! {134 pub const MinimumPeriod: u64 = 1;135}136137impl pallet_timestamp::Config for Test {138 type Moment = u64;139 type OnTimestampSet = Aura;140 type MinimumPeriod = MinimumPeriod;141 type WeightInfo = ();142}143144impl pallet_aura::Config for Test {145 type AuthorityId = sp_consensus_aura::sr25519::AuthorityId;146 type MaxAuthorities = MaxAuthorities;147 type DisabledValidators = ();148}149150sp_runtime::impl_opaque_keys! {151 pub struct MockSessionKeys {152 // a key for aura authoring153 pub aura: UintAuthorityId,154 }155}156157impl From<UintAuthorityId> for MockSessionKeys {158 fn from(aura: sp_runtime::testing::UintAuthorityId) -> Self {159 Self { aura }160 }161}162163parameter_types! {164 pub static SessionHandlerCollators: Vec<u64> = Vec::new();165 pub static SessionChangeBlock: u64 = 0;166}167168pub struct TestSessionHandler;169impl pallet_session::SessionHandler<u64> for TestSessionHandler {170 const KEY_TYPE_IDS: &'static [sp_runtime::KeyTypeId] = &[UintAuthorityId::ID];171 fn on_genesis_session<Ks: OpaqueKeys>(keys: &[(u64, Ks)]) {172 SessionHandlerCollators::set(keys.into_iter().map(|(a, _)| *a).collect::<Vec<_>>())173 }174 fn on_new_session<Ks: OpaqueKeys>(_: bool, keys: &[(u64, Ks)], _: &[(u64, Ks)]) {175 SessionChangeBlock::set(System::block_number());176 dbg!(keys.len());177 SessionHandlerCollators::set(keys.into_iter().map(|(a, _)| *a).collect::<Vec<_>>())178 }179 fn on_before_session_ending() {}180 fn on_disabled(_: u32) {}181}182183parameter_types! {184 pub const Offset: u64 = 0;185 pub const Period: u64 = 10;186}187188impl pallet_session::Config for Test {189 type RuntimeEvent = RuntimeEvent;190 type ValidatorId = <Self as frame_system::Config>::AccountId;191 // we don't have stash and controller, thus we don't need the convert as well.192 type ValidatorIdOf = IdentityCollator;193 type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;194 type NextSessionRotation = pallet_session::PeriodicSessions<Period, Offset>;195 type SessionManager = CollatorSelection;196 type SessionHandler = TestSessionHandler;197 type Keys = MockSessionKeys;198 type WeightInfo = ();199}200201parameter_types! {202 pub const MaxCollators: u32 = 5;203 pub const LicenseBond: u64 = 10;204 pub const KickThreshold: u64 = 10;205 // the following values do not matter and are meaningless, etc.206 pub const DefaultWeightToFeeCoefficient: u64 = 100_000;207 pub const DefaultMinGasPrice: u64 = 100_000;208 pub const MaxXcmAllowedLocations: u32 = 16;209 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);210 pub const DayRelayBlocks: u32 = 1;211 pub const LicenceBondIdentifier: [u8; 16] = *b"licenceidentifie";212}213214ord_parameter_types! {215 pub const RootAccount: u64 = 777;216}217218parameter_types! {219 pub const PotId: PalletId = PalletId(*b"PotStake");220 pub const MaxAuthorities: u32 = 100_000;221 pub const SlashRatio: Perbill = Perbill::one();222}223224pub struct IsRegistered;225impl ValidatorRegistration<u64> for IsRegistered {226 fn is_registered(id: &u64) -> bool {227 *id != 7u64228 }229}230231impl Config for Test {232 type RuntimeEvent = RuntimeEvent;233 type UpdateOrigin = EnsureSignedBy<RootAccount, u64>;234 type PotId = PotId;235 type MaxCollators = MaxCollators;236 type SlashRatio = SlashRatio;237 type TreasuryAccountId = ();238 type ValidatorId = <Self as frame_system::Config>::AccountId;239 type ValidatorIdOf = IdentityCollator;240 type ValidatorRegistration = IsRegistered;241 type LicenceBondIdentifier = LicenceBondIdentifier;242 type Currency = Balances;243 type DesiredCollators = MaxCollators;244 type LicenseBond = LicenseBond;245 type KickThreshold = KickThreshold;246 type WeightInfo = ();247}248249pub fn new_test_ext() -> sp_io::TestExternalities {250 sp_tracing::try_init_simple();251 let mut t = frame_system::GenesisConfig::default()252 .build_storage::<Test>()253 .unwrap();254 let invulnerables = vec![1, 2];255256 let ed = <Test as pallet_balances::Config>::ExistentialDeposit::get();257258 let balances: Vec<(u64, u64)> = (1..=<Test as Config>::DesiredCollators::get() as u64 + 1)259 .map(|i| (i, 100))260 .chain(core::iter::once((33, ed)))261 .collect();262263 let keys = balances264 .iter()265 .map(|&(i, _)| {266 (267 i,268 i,269 MockSessionKeys {270 aura: UintAuthorityId(i),271 },272 )273 })274 .collect::<Vec<_>>();275 let collator_selection = collator_selection::GenesisConfig::<Test> { invulnerables };276 let session = pallet_session::GenesisConfig::<Test> { keys };277 pallet_balances::GenesisConfig::<Test> { balances }278 .assimilate_storage(&mut t)279 .unwrap();280 // collator selection must be initialized before session.281 collator_selection.assimilate_storage(&mut t).unwrap();282 session.assimilate_storage(&mut t).unwrap();283284 t.into()285}286287pub fn initialize_to_block(n: u64) {288 for i in System::block_number() + 1..=n {289 System::set_block_number(i);290 <AllPalletsWithSystem as frame_support::traits::OnInitialize<u64>>::on_initialize(i);291 }292}pallets/collator-selection/src/tests.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/tests.rs
+++ b/pallets/collator-selection/src/tests.rs
@@ -32,10 +32,10 @@
use frame_support::{
assert_noop, assert_ok,
- traits::{fungible, GenesisBuild, OnInitialize},
+ traits::{fungible, OnInitialize},
};
use scale_info::prelude::*;
-use sp_runtime::{traits::BadOrigin, TokenError};
+use sp_runtime::{traits::BadOrigin, BuildStorage, TokenError};
use crate::{self as collator_selection, mock::*, Config, Error};
@@ -464,8 +464,8 @@
#[should_panic = "duplicate invulnerables in genesis."]
fn cannot_set_genesis_value_twice() {
sp_tracing::try_init_simple();
- let mut t = frame_system::GenesisConfig::default()
- .build_storage::<Test>()
+ let mut t = <frame_system::GenesisConfig<Test>>::default()
+ .build_storage()
.unwrap();
let invulnerables = vec![1, 1];
pallets/identity/src/tests.rsdiffbeforeafterboth--- a/pallets/identity/src/tests.rs
+++ b/pallets/identity/src/tests.rs
@@ -43,7 +43,6 @@
use parity_scale_codec::{Decode, Encode};
use sp_core::H256;
use sp_runtime::{
- testing::Header,
traits::{BadOrigin, BlakeTwo256, IdentityLookup},
BuildStorage,
};
@@ -51,8 +50,7 @@
use super::*;
use crate as pallet_identity;
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = frame_system::mocking::MockBlockU32<Test>;
frame_support::construct_runtime!(
pub enum Test {
@@ -79,7 +77,7 @@
type AccountId = u64;
type Lookup = IdentityLookup<Self::AccountId>;
type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
+ type BlockHashCount = ConstU32<250>;
type DbWeight = ();
type Version = ();
type PalletInfo = PalletInfo;
pallets/inflation/src/tests.rsdiffbeforeafterboth--- a/pallets/inflation/src/tests.rs
+++ b/pallets/inflation/src/tests.rs
@@ -34,12 +34,12 @@
use crate as pallet_inflation;
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = frame_system::mocking::MockBlockU32<Test>;
-const YEAR: u64 = 5_259_600; // 6-second blocks
- // const YEAR: u64 = 2_629_800; // 12-second blocks
- // Expected 100-block inflation for year 1 is 100 * 100_000_000 / YEAR = FIRST_YEAR_BLOCK_INFLATION
+// 6-second blocks
+// const YEAR: u32 = 2_629_800; // 12-second blocks
+// Expected 100-block inflation for year 1 is 100 * 100_000_000 / YEAR = FIRST_YEAR_BLOCK_INFLATION
+const YEAR: u32 = 5_259_600;
const FIRST_YEAR_BLOCK_INFLATION: u64 = 1901;
parameter_types! {
@@ -60,6 +60,7 @@
type FreezeIdentifier = ();
type MaxHolds = ();
type MaxFreezes = ();
+ type RuntimeHoldReason = RuntimeHoldReason;
}
frame_support::construct_runtime!(
@@ -71,7 +72,7 @@
);
parameter_types! {
- pub const BlockHashCount: u64 = 250;
+ pub const BlockHashCount: u32 = 250;
pub BlockWeights: frame_system::limits::BlockWeights =
frame_system::limits::BlockWeights::simple_max(Weight::from_parts(1024, 0));
pub const SS58Prefix: u8 = 42;
@@ -79,6 +80,7 @@
impl frame_system::Config for Test {
type BaseCallFilter = Everything;
+ type Block = Block;
type BlockWeights = ();
type BlockLength = ();
type DbWeight = ();
@@ -187,7 +189,7 @@
fn inflation_second_deposit() {
new_test_ext().execute_with(|| {
// Total issuance = 1_000_000_000
- let initial_issuance: u64 = 1_000_000_000;
+ let initial_issuance = 1_000_000_000;
let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
MockBlockNumberProvider::set(1);
@@ -196,20 +198,20 @@
assert_ok!(Inflation::start_inflation(RawOrigin::Root.into(), 1));
// Next inflation deposit happens when block is greater then or equal to NextInflationBlock
- let mut block: u64 = 2;
- let balance_before: u64 = Balances::free_balance(1234);
+ let mut block = 2;
+ let balance_before = Balances::free_balance(1234);
while block < <pallet_inflation::NextInflationBlock<Test>>::get() {
- MockBlockNumberProvider::set(block as u64);
+ MockBlockNumberProvider::set(block);
Inflation::on_initialize(0);
block += 1;
}
- let balance_just_before: u64 = Balances::free_balance(1234);
+ let balance_just_before = Balances::free_balance(1234);
assert_eq!(balance_before, balance_just_before);
// The block with inflation
- MockBlockNumberProvider::set(block as u64);
+ MockBlockNumberProvider::set(block);
Inflation::on_initialize(0);
- let balance_after: u64 = Balances::free_balance(1234);
+ let balance_after = Balances::free_balance(1234);
assert_eq!(balance_after - balance_just_before, block_inflation!());
});
}
@@ -234,7 +236,7 @@
Inflation::on_initialize(0);
}
assert_eq!(
- initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),
+ initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * ((YEAR as u64) / 100)),
<Balances as Inspect<_>>::total_issuance()
);
@@ -243,8 +245,8 @@
let block_inflation_year_2 = block_inflation!();
// Expected 100-block inflation for year 2: 100 * 9.33% * initial issuance * 110% / YEAR == 1951
let expecter_year_2_inflation: u64 = (initial_issuance
- + FIRST_YEAR_BLOCK_INFLATION * YEAR / 100)
- * 933 * 100 / (10000 * YEAR);
+ + FIRST_YEAR_BLOCK_INFLATION * (YEAR as u64) / 100)
+ * 933 * 100 / (10000 * (YEAR as u64));
assert_eq!(block_inflation_year_2 / 10, expecter_year_2_inflation / 10); // divide by 10 for approx. equality
});
}
@@ -253,8 +255,8 @@
fn inflation_start_large_kusama_block() {
new_test_ext().execute_with(|| {
// Total issuance = 1_000_000_000
- let initial_issuance: u64 = 1_000_000_000;
- let start_block: u64 = 10457457;
+ let initial_issuance = 1_000_000_000;
+ let start_block = 10457457;
let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
MockBlockNumberProvider::set(start_block);
@@ -273,7 +275,7 @@
Inflation::on_initialize(0);
}
assert_eq!(
- initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),
+ initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * ((YEAR as u64) / 100)),
<Balances as Inspect<_>>::total_issuance()
);
@@ -282,8 +284,8 @@
let block_inflation_year_2 = block_inflation!();
// Expected 100-block inflation for year 2: 100 * 9.33% * initial issuance * 110% / YEAR == 1951
let expecter_year_2_inflation: u64 = (initial_issuance
- + FIRST_YEAR_BLOCK_INFLATION * YEAR / 100)
- * 933 * 100 / (10000 * YEAR);
+ + FIRST_YEAR_BLOCK_INFLATION * (YEAR as u64) / 100)
+ * 933 * 100 / (10000 * (YEAR as u64));
assert_eq!(block_inflation_year_2 / 10, expecter_year_2_inflation / 10); // divide by 10 for approx. equality
});
}
@@ -320,14 +322,14 @@
#[test]
fn inflation_rate_by_year() {
new_test_ext().execute_with(|| {
- let payouts: u64 = YEAR / InflationBlockInterval::get() as u64;
+ let payouts = (YEAR / InflationBlockInterval::get()) as u64;
// Inflation starts at 10% and does down by 2/3% every year until year 9 (included),
// then it is flat.
let payout_by_year: [u64; 11] = [1000, 933, 867, 800, 733, 667, 600, 533, 467, 400, 400];
// For accuracy total issuance = payout0 * payouts * 10;
- let initial_issuance: u64 = payout_by_year[0] * payouts * 10;
+ let initial_issuance = payout_by_year[0] * payouts * 10;
let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
runtime/common/tests/mod.rsdiffbeforeafterboth--- a/runtime/common/tests/mod.rs
+++ b/runtime/common/tests/mod.rs
@@ -19,7 +19,7 @@
use sp_runtime::{BuildStorage, Storage};
use up_common::types::AuraId;
-use crate::{BuildGenesisConfig, ParachainInfoConfig, Runtime, RuntimeEvent, System};
+use crate::{ParachainInfoConfig, Runtime, RuntimeEvent, RuntimeGenesisConfig, System};
pub type Balance = u128;
pub mod xcm;
@@ -51,8 +51,8 @@
fn new_test_ext(balances: Vec<(AccountId, Balance)>) -> sp_io::TestExternalities {
let mut storage = make_basic_storage();
- pallet_balances::BuildGenesisConfig::<Runtime> { balances }
- .build_storage(&mut storage)
+ pallet_balances::GenesisConfig::<Runtime> { balances }
+ .assimilate_storage(&mut storage)
.unwrap();
let mut ext = sp_io::TestExternalities::new(storage);
@@ -95,7 +95,7 @@
.map(|acc| get_account_id_from_seed::<sr25519::Public>(acc))
.collect::<Vec<_>>();
- let cfg = BuildGenesisConfig {
+ let cfg = RuntimeGenesisConfig {
collator_selection: CollatorSelectionConfig { invulnerables },
session: SessionConfig { keys },
parachain_info: ParachainInfoConfig {
@@ -112,7 +112,7 @@
fn make_basic_storage() -> Storage {
use crate::AuraConfig;
- let cfg = BuildGenesisConfig {
+ let cfg = RuntimeGenesisConfig {
aura: AuraConfig {
authorities: vec![
get_from_seed::<AuraId>("Alice"),
runtime/common/tests/xcm.rsdiffbeforeafterboth--- a/runtime/common/tests/xcm.rs
+++ b/runtime/common/tests/xcm.rs
@@ -52,9 +52,9 @@
let xcm_event = &last_events(1)[0];
match xcm_event {
- RuntimeEvent::PolkadotXcm(pallet_xcm::Event::<Runtime>::Attempted(
- Outcome::Incomplete(_weight, Error::NoPermission),
- )) => { /* Pass */ }
+ RuntimeEvent::PolkadotXcm(pallet_xcm::Event::<Runtime>::Attempted {
+ outcome: Outcome::Incomplete(_weight, Error::NoPermission),
+ }) => { /* Pass */ }
_ => panic!(
"Expected PolkadotXcm.Attempted(Incomplete(_weight, NoPermission)),\
found: {xcm_event:#?}"
runtime/tests/src/dispatch.rsdiffbeforeafterboth--- /dev/null
+++ b/runtime/tests/src/dispatch.rs
@@ -0,0 +1 @@
+../../common/dispatch.rs
\ No newline at end of file
runtime/tests/src/lib.rsdiffbeforeafterboth--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -33,23 +33,20 @@
use scale_info::TypeInfo;
use sp_core::{H160, H256, U256};
use sp_runtime::{
- testing::Header,
traits::{BlakeTwo256, IdentityLookup},
+ BuildStorage,
};
use up_data_structs::mapping::{CrossTokenAddressMapping, EvmTokenAddressMapping};
-#[path = "../../common/dispatch.rs"]
mod dispatch;
use dispatch::CollectionDispatchT;
-#[path = "../../common/weights/mod.rs"]
mod weights;
use weights::CommonWeights;
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = frame_system::mocking::MockBlockU32<Test>;
#[cfg(test)]
mod tests;
@@ -73,13 +70,14 @@
);
parameter_types! {
- pub const BlockHashCount: u64 = 250;
+ pub const BlockHashCount: u32 = 250;
pub const SS58Prefix: u8 = 42;
}
impl system::Config for Test {
type RuntimeEvent = RuntimeEvent;
type BaseCallFilter = Everything;
+ type Block = Block;
type BlockWeights = ();
type BlockLength = ();
type DbWeight = ();
@@ -120,6 +118,7 @@
type MaxFreezes = MaxLocks;
type FreezeIdentifier = [u8; 8];
type MaxHolds = MaxLocks;
+ type RuntimeHoldReason = RuntimeHoldReason;
}
parameter_types! {
@@ -232,6 +231,7 @@
type OnMethodCall = ();
type OnCreate = ();
type OnChargeTransaction = ();
+ type OnCheckEvmTransaction = ();
type FindAuthor = ();
type BlockHashMapping = SubstrateBlockHashMapping<Self>;
type Timestamp = Timestamp;
@@ -296,8 +296,8 @@
// Build genesis storage according to the mock runtime.
pub fn new_test_ext() -> sp_io::TestExternalities {
- system::GenesisConfig::default()
- .build_storage::<Test>()
+ <system::GenesisConfig<Test>>::default()
+ .build_storage()
.unwrap()
.into()
}
runtime/tests/src/weightsdiffbeforeafterboth--- /dev/null
+++ b/runtime/tests/src/weights
@@ -0,0 +1 @@
+../../common/weights
\ No newline at end of file