pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 18:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid an excessive amount of unrelated errors on prior rustc error

Browse Source 
`1.into()` -> `ParaId::from(1_u32)` (#5500)
This commit is contained in:
Bernhard Schuster
2022-05-11 16:11:48 +02:00
committed by GitHub
parent 718380119a
commit b67b7fa355
9 changed files with 201 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/parachains/src/configuration/migration.rs
+2 -2
View File
@@ -20,6 +20,6 @@ use frame_support::traits::StorageVersion;
/// The current storage version.
///
/// v0-v1: https://github.com/paritytech/polkadot/pull/3575
/// v1-v2: https://github.com/paritytech/polkadot/pull/4420
/// v0-v1: <https://github.com/paritytech/polkadot/pull/3575>
/// v1-v2: <https://github.com/paritytech/polkadot/pull/4420>
pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
polkadot/runtime/parachains/src/inclusion/tests.rs
+19 -19
View File
@@ -306,9 +306,9 @@ pub(crate) fn make_vdata_hash(para_id: ParaId) -> Option<Hash> {
#[test]
fn collect_pending_cleans_up_pending() {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let thread_a = ParaId::from(3);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let thread_a = ParaId::from(3_u32);
let paras = vec![(chain_a, true), (chain_b, true), (thread_a, false)];
new_test_ext(genesis_config(paras)).execute_with(|| {
@@ -364,9 +364,9 @@ fn collect_pending_cleans_up_pending() {
#[test]
fn bitfield_checks() {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let thread_a = ParaId::from(3);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let thread_a = ParaId::from(3_u32);
let paras = vec![(chain_a, true), (chain_b, true), (thread_a, false)];
let validators = vec![
@@ -705,9 +705,9 @@ fn bitfield_checks() {
#[test]
fn supermajority_bitfields_trigger_availability() {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let thread_a = ParaId::from(3);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let thread_a = ParaId::from(3_u32);
let paras = vec![(chain_a, true), (chain_b, true), (thread_a, false)];
let validators = vec![
@@ -890,9 +890,9 @@ fn supermajority_bitfields_trigger_availability() {
#[test]
fn candidate_checks() {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let thread_a = ParaId::from(3);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let thread_a = ParaId::from(3_u32);
// The block number of the relay-parent for testing.
const RELAY_PARENT_NUM: BlockNumber = 4;
@@ -1433,9 +1433,9 @@ fn candidate_checks() {
#[test]
fn backing_works() {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let thread_a = ParaId::from(3);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let thread_a = ParaId::from(3_u32);
// The block number of the relay-parent for testing.
const RELAY_PARENT_NUM: BlockNumber = 4;
@@ -1715,7 +1715,7 @@ fn backing_works() {
#[test]
fn can_include_candidate_with_ok_code_upgrade() {
let chain_a = ParaId::from(1);
let chain_a = ParaId::from(1_u32);
// The block number of the relay-parent for testing.
const RELAY_PARENT_NUM: BlockNumber = 4;
@@ -1821,9 +1821,9 @@ fn can_include_candidate_with_ok_code_upgrade() {
#[test]
fn session_change_wipes() {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let thread_a = ParaId::from(3);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let thread_a = ParaId::from(3_u32);
let paras = vec![(chain_a, true), (chain_b, true), (thread_a, false)];
let validators = vec![
polkadot/runtime/parachains/src/reward_points.rs
+1 -1
View File
@@ -17,7 +17,7 @@
//! An implementation of the `RewardValidators` trait used by `inclusion` that employs
//! `pallet-staking` to compute the rewards.
//!
//! Based on https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html
//! Based on <https://research.web3.foundation/en/latest/polkadot/overview/2-token-economics.html>
//! which doesn't currently mention availability bitfields. As such, we don't reward them
//! for the time being, although we will build schemes to do so in the future.
polkadot/runtime/parachains/src/scheduler/tests.rs
+40 -40
View File
@@ -227,10 +227,10 @@ fn session_change_prunes_cores_beyond_retries_and_those_from_non_live_parathread
};
let max_parathread_retries = default_config().parathread_retries;
let thread_a = ParaId::from(1);
let thread_b = ParaId::from(2);
let thread_c = ParaId::from(3);
let thread_d = ParaId::from(4);
let thread_a = ParaId::from(1_u32);
let thread_b = ParaId::from(2_u32);
let thread_c = ParaId::from(3_u32);
let thread_d = ParaId::from(4_u32);
let collator = CollatorId::from(Sr25519Keyring::Alice.public());
@@ -330,8 +330,8 @@ fn session_change_shuffles_validators() {
assert_eq!(default_config().parathread_cores, 3);
new_test_ext(genesis_config).execute_with(|| {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
// ensure that we have 5 groups by registering 2 parachains.
schedule_blank_para(chain_a, true);
@@ -387,9 +387,9 @@ fn session_change_takes_only_max_per_core() {
};
new_test_ext(genesis_config).execute_with(|| {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let chain_c = ParaId::from(3);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let chain_c = ParaId::from(3_u32);
// ensure that we have 5 groups by registering 2 parachains.
schedule_blank_para(chain_a, true);
@@ -434,12 +434,12 @@ fn schedule_schedules() {
..Default::default()
};
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let thread_a = ParaId::from(3);
let thread_b = ParaId::from(4);
let thread_c = ParaId::from(5);
let thread_a = ParaId::from(3_u32);
let thread_b = ParaId::from(4_u32);
let thread_c = ParaId::from(5_u32);
let collator = CollatorId::from(Sr25519Keyring::Alice.public());
@@ -559,14 +559,14 @@ fn schedule_schedules_including_just_freed() {
..Default::default()
};
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let thread_a = ParaId::from(3);
let thread_b = ParaId::from(4);
let thread_c = ParaId::from(5);
let thread_d = ParaId::from(6);
let thread_e = ParaId::from(7);
let thread_a = ParaId::from(3_u32);
let thread_b = ParaId::from(4_u32);
let thread_c = ParaId::from(5_u32);
let thread_d = ParaId::from(6_u32);
let thread_e = ParaId::from(7_u32);
let collator = CollatorId::from(Sr25519Keyring::Alice.public());
@@ -735,9 +735,9 @@ fn schedule_clears_availability_cores() {
..Default::default()
};
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let chain_c = ParaId::from(3);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
let chain_c = ParaId::from(3_u32);
new_test_ext(genesis_config).execute_with(|| {
assert_eq!(default_config().parathread_cores, 3);
@@ -841,8 +841,8 @@ fn schedule_rotates_groups() {
..Default::default()
};
let thread_a = ParaId::from(1);
let thread_b = ParaId::from(2);
let thread_a = ParaId::from(1_u32);
let thread_b = ParaId::from(2_u32);
let collator = CollatorId::from(Sr25519Keyring::Alice.public());
@@ -913,8 +913,8 @@ fn parathread_claims_are_pruned_after_retries() {
..Default::default()
};
let thread_a = ParaId::from(1);
let thread_b = ParaId::from(2);
let thread_a = ParaId::from(1_u32);
let thread_b = ParaId::from(2_u32);
let collator = CollatorId::from(Sr25519Keyring::Alice.public());
@@ -974,8 +974,8 @@ fn availability_predicate_works() {
thread_availability_period < group_rotation_frequency
);
let chain_a = ParaId::from(1);
let thread_a = ParaId::from(2);
let chain_a = ParaId::from(1_u32);
let thread_a = ParaId::from(2_u32);
new_test_ext(genesis_config).execute_with(|| {
schedule_blank_para(chain_a, true);
@@ -1069,8 +1069,8 @@ fn next_up_on_available_uses_next_scheduled_or_none_for_thread() {
..Default::default()
};
let thread_a = ParaId::from(1);
let thread_b = ParaId::from(2);
let thread_a = ParaId::from(1_u32);
let thread_b = ParaId::from(2_u32);
let collator = CollatorId::from(Sr25519Keyring::Alice.public());
@@ -1141,8 +1141,8 @@ fn next_up_on_time_out_reuses_claim_if_nothing_queued() {
..Default::default()
};
let thread_a = ParaId::from(1);
let thread_b = ParaId::from(2);
let thread_a = ParaId::from(1_u32);
let thread_b = ParaId::from(2_u32);
let collator = CollatorId::from(Sr25519Keyring::Alice.public());
@@ -1219,7 +1219,7 @@ fn next_up_on_available_is_parachain_always() {
..Default::default()
};
let chain_a = ParaId::from(1);
let chain_a = ParaId::from(1_u32);
new_test_ext(genesis_config).execute_with(|| {
schedule_blank_para(chain_a, true);
@@ -1273,7 +1273,7 @@ fn next_up_on_time_out_is_parachain_always() {
..Default::default()
};
let chain_a = ParaId::from(1);
let chain_a = ParaId::from(1_u32);
new_test_ext(genesis_config).execute_with(|| {
schedule_blank_para(chain_a, true);
@@ -1326,8 +1326,8 @@ fn session_change_requires_reschedule_dropping_removed_paras() {
assert_eq!(default_config().parathread_cores, 3);
new_test_ext(genesis_config).execute_with(|| {
let chain_a = ParaId::from(1);
let chain_b = ParaId::from(2);
let chain_a = ParaId::from(1_u32);
let chain_b = ParaId::from(2_u32);
// ensure that we have 5 groups by registering 2 parachains.
schedule_blank_para(chain_a, true);
@@ -1401,8 +1401,8 @@ fn parathread_claims_are_pruned_after_deregistration() {
..Default::default()
};
let thread_a = ParaId::from(1);
let thread_b = ParaId::from(2);
let thread_a = ParaId::from(1_u32);
let thread_b = ParaId::from(2_u32);
let collator = CollatorId::from(Sr25519Keyring::Alice.public());
polkadot/runtime/parachains/src/session_info.rs
+1 -1
View File
@@ -17,7 +17,7 @@
//! The session info pallet provides information about validator sets
//! from prior sessions needed for approvals and disputes.
//!
//! See https://w3f.github.io/parachain-implementers-guide/runtime/session_info.html.
//! See <https://w3f.github.io/parachain-implementers-guide/runtime/session_info.html>.
use crate::{
configuration, paras, scheduler, shared,