mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-31 07:31:02 +00:00
Moves Block to frame_system instead of construct_runtime and removes Header and BlockNumber (#7431)
* Companion for substrate * Minor update * Formatting * Fixes for cumulus * Fixes tests in polkadot-runtime-parachains * Minor update * Removes unused import * Fixes tests in polkadot-runtime-common * Minor fix * Update roadmap/implementers-guide/src/runtime/configuration.md Co-authored-by: ordian <write@reusable.software> * ".git/.scripts/commands/fmt/fmt.sh" * update lockfile for {"substrate"} --------- Co-authored-by: ordian <write@reusable.software> Co-authored-by: command-bot <>
This commit is contained in:
@@ -369,7 +369,7 @@ pub mod pallet {
|
||||
/// Invariant:
|
||||
/// - each para `P` used here as a key should satisfy `Paras::is_valid_para(P)` within a session.
|
||||
#[pallet::storage]
|
||||
pub type HrmpWatermarks<T: Config> = StorageMap<_, Twox64Concat, ParaId, T::BlockNumber>;
|
||||
pub type HrmpWatermarks<T: Config> = StorageMap<_, Twox64Concat, ParaId, BlockNumberFor<T>>;
|
||||
|
||||
/// HRMP channel data associated with each para.
|
||||
/// Invariant:
|
||||
@@ -407,7 +407,7 @@ pub mod pallet {
|
||||
_,
|
||||
Twox64Concat,
|
||||
HrmpChannelId,
|
||||
Vec<InboundHrmpMessage<T::BlockNumber>>,
|
||||
Vec<InboundHrmpMessage<BlockNumberFor<T>>>,
|
||||
ValueQuery,
|
||||
>;
|
||||
|
||||
@@ -419,7 +419,7 @@ pub mod pallet {
|
||||
/// same block number.
|
||||
#[pallet::storage]
|
||||
pub type HrmpChannelDigests<T: Config> =
|
||||
StorageMap<_, Twox64Concat, ParaId, Vec<(T::BlockNumber, Vec<ParaId>)>, ValueQuery>;
|
||||
StorageMap<_, Twox64Concat, ParaId, Vec<(BlockNumberFor<T>, Vec<ParaId>)>, ValueQuery>;
|
||||
|
||||
/// Preopen the given HRMP channels.
|
||||
///
|
||||
@@ -659,7 +659,7 @@ fn preopen_hrmp_channel<T: Config>(
|
||||
/// Routines and getters related to HRMP.
|
||||
impl<T: Config> Pallet<T> {
|
||||
/// Block initialization logic, called by initializer.
|
||||
pub(crate) fn initializer_initialize(_now: T::BlockNumber) -> Weight {
|
||||
pub(crate) fn initializer_initialize(_now: BlockNumberFor<T>) -> Weight {
|
||||
Weight::zero()
|
||||
}
|
||||
|
||||
@@ -668,7 +668,7 @@ impl<T: Config> Pallet<T> {
|
||||
|
||||
/// Called by the initializer to note that a new session has started.
|
||||
pub(crate) fn initializer_on_new_session(
|
||||
notification: &initializer::SessionChangeNotification<T::BlockNumber>,
|
||||
notification: &initializer::SessionChangeNotification<BlockNumberFor<T>>,
|
||||
outgoing_paras: &[ParaId],
|
||||
) -> Weight {
|
||||
let w1 = Self::perform_outgoing_para_cleanup(¬ification.prev_config, outgoing_paras);
|
||||
@@ -685,7 +685,7 @@ impl<T: Config> Pallet<T> {
|
||||
/// Iterate over all paras that were noted for offboarding and remove all the data
|
||||
/// associated with them.
|
||||
fn perform_outgoing_para_cleanup(
|
||||
config: &HostConfiguration<T::BlockNumber>,
|
||||
config: &HostConfiguration<BlockNumberFor<T>>,
|
||||
outgoing: &[ParaId],
|
||||
) -> Weight {
|
||||
let mut w = Self::clean_open_channel_requests(config, outgoing);
|
||||
@@ -710,7 +710,7 @@ impl<T: Config> Pallet<T> {
|
||||
//
|
||||
// This will also perform the refunds for the counterparty if it doesn't offboard.
|
||||
pub(crate) fn clean_open_channel_requests(
|
||||
config: &HostConfiguration<T::BlockNumber>,
|
||||
config: &HostConfiguration<BlockNumberFor<T>>,
|
||||
outgoing: &[ParaId],
|
||||
) -> Weight {
|
||||
// First collect all the channel ids of the open requests in which there is at least one
|
||||
@@ -786,7 +786,7 @@ impl<T: Config> Pallet<T> {
|
||||
///
|
||||
/// - prune the stale requests
|
||||
/// - enact the confirmed requests
|
||||
fn process_hrmp_open_channel_requests(config: &HostConfiguration<T::BlockNumber>) {
|
||||
fn process_hrmp_open_channel_requests(config: &HostConfiguration<BlockNumberFor<T>>) {
|
||||
let mut open_req_channels = HrmpOpenChannelRequestsList::<T>::get();
|
||||
if open_req_channels.is_empty() {
|
||||
return
|
||||
@@ -894,9 +894,9 @@ impl<T: Config> Pallet<T> {
|
||||
/// Check that the candidate of the given recipient controls the HRMP watermark properly.
|
||||
pub(crate) fn check_hrmp_watermark(
|
||||
recipient: ParaId,
|
||||
relay_chain_parent_number: T::BlockNumber,
|
||||
new_hrmp_watermark: T::BlockNumber,
|
||||
) -> Result<(), HrmpWatermarkAcceptanceErr<T::BlockNumber>> {
|
||||
relay_chain_parent_number: BlockNumberFor<T>,
|
||||
new_hrmp_watermark: BlockNumberFor<T>,
|
||||
) -> Result<(), HrmpWatermarkAcceptanceErr<BlockNumberFor<T>>> {
|
||||
// First, check where the watermark CANNOT legally land.
|
||||
//
|
||||
// (a) For ensuring that messages are eventually processed, we require each parablock's
|
||||
@@ -942,7 +942,7 @@ impl<T: Config> Pallet<T> {
|
||||
}
|
||||
|
||||
pub(crate) fn check_outbound_hrmp(
|
||||
config: &HostConfiguration<T::BlockNumber>,
|
||||
config: &HostConfiguration<BlockNumberFor<T>>,
|
||||
sender: ParaId,
|
||||
out_hrmp_msgs: &[OutboundHrmpMessage<ParaId>],
|
||||
) -> Result<(), OutboundHrmpAcceptanceErr> {
|
||||
@@ -1005,7 +1005,7 @@ impl<T: Config> Pallet<T> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) fn prune_hrmp(recipient: ParaId, new_hrmp_watermark: T::BlockNumber) -> Weight {
|
||||
pub(crate) fn prune_hrmp(recipient: ParaId, new_hrmp_watermark: BlockNumberFor<T>) -> Weight {
|
||||
let mut weight = Weight::zero();
|
||||
|
||||
// sift through the incoming messages digest to collect the paras that sent at least one
|
||||
@@ -1390,7 +1390,7 @@ impl<T: Config> Pallet<T> {
|
||||
/// messages in them are also included.
|
||||
pub(crate) fn inbound_hrmp_channels_contents(
|
||||
recipient: ParaId,
|
||||
) -> BTreeMap<ParaId, Vec<InboundHrmpMessage<T::BlockNumber>>> {
|
||||
) -> BTreeMap<ParaId, Vec<InboundHrmpMessage<BlockNumberFor<T>>>> {
|
||||
let sender_set = HrmpIngressChannelsIndex::<T>::get(&recipient);
|
||||
|
||||
let mut inbound_hrmp_channels_contents = BTreeMap::new();
|
||||
|
||||
Reference in New Issue
Block a user