FAZ 1 Complete: Workspace compile fixes, warning cleanup, version bumps
- Fixed is_using_frame_crate() macro to check for pezframe/pezkuwi_sdk - Removed disable_pezframe_system_supertrait_check temporary bypasses - Feature-gated storage-benchmark and teyrchain-benchmarks code - Fixed dead_code warnings with underscore prefix (_Header) - Removed unused imports and shadowing use statements - Version bumps: procedural-tools 10.0.1, benchmarking-cli 32.0.1, docs 0.0.2, minimal-runtime 0.0.1, yet-another-teyrchain 0.6.1, umbrella 0.1.2 - Updated MAINNET_ROADMAP.md with FAZ 1 completion status
This commit is contained in:
@@ -171,7 +171,7 @@ mod benchmarks {
|
||||
{
|
||||
crate::Pezpallet::<T, I>::slash_and_deregister(
|
||||
&relayer,
|
||||
bp_relayers::ExplicitOrAccountParams::Explicit::<_, ()>(slash_destination),
|
||||
pezbp_relayers::ExplicitOrAccountParams::Explicit::<_, ()>(slash_destination),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ use crate::{
|
||||
extension::verify_messages_call_succeeded, Config as BridgeRelayersConfig, LOG_TARGET,
|
||||
};
|
||||
|
||||
use bp_relayers::{BatchCallUnpacker, ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
|
||||
use pezbp_relayers::{BatchCallUnpacker, ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
|
||||
use core::marker::PhantomData;
|
||||
use pezbp_runtime::{Chain, StaticStrProvider};
|
||||
use pezframe_support::dispatch::{DispatchInfo, PostDispatchInfo};
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
use crate::{extension::verify_messages_call_succeeded, Config as BridgeRelayersConfig};
|
||||
|
||||
use bp_relayers::{ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
|
||||
use pezbp_relayers::{ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
|
||||
use core::marker::PhantomData;
|
||||
use pezbp_runtime::StaticStrProvider;
|
||||
use pezframe_support::dispatch::{DispatchInfo, PostDispatchInfo};
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
|
||||
use crate::{Config as RelayersConfig, Pezpallet as RelayersPallet, WeightInfoExt, LOG_TARGET};
|
||||
|
||||
use bp_messages::{ChainWithMessages, MessageNonce};
|
||||
use bp_relayers::{
|
||||
use pezbp_messages::{ChainWithMessages, MessageNonce};
|
||||
use pezbp_relayers::{
|
||||
ExplicitOrAccountParams, ExtensionCallData, ExtensionCallInfo, ExtensionConfig,
|
||||
RewardsAccountOwner, RewardsAccountParams,
|
||||
};
|
||||
@@ -86,7 +86,7 @@ impl<AccountId, RemoteGrandpaChainBlockNumber: Debug, LaneId: Clone + Copy + Deb
|
||||
#[cfg(test)]
|
||||
pub fn submit_finality_proof_info_mut(
|
||||
&mut self,
|
||||
) -> Option<&mut bp_header_pez_chain::SubmitFinalityProofInfo<RemoteGrandpaChainBlockNumber>> {
|
||||
) -> Option<&mut pezbp_header_pez_chain::SubmitFinalityProofInfo<RemoteGrandpaChainBlockNumber>> {
|
||||
match self.call_info {
|
||||
ExtensionCallInfo::AllFinalityAndMsgs(ref mut info, _, _) => Some(info),
|
||||
ExtensionCallInfo::RelayFinalityAndMsgs(ref mut info, _) => Some(info),
|
||||
@@ -455,18 +455,18 @@ mod tests {
|
||||
use super::*;
|
||||
use crate::mock::*;
|
||||
|
||||
use bp_header_pez_chain::{StoredHeaderDataBuilder, SubmitFinalityProofInfo};
|
||||
use bp_messages::{
|
||||
use pezbp_header_pez_chain::{StoredHeaderDataBuilder, SubmitFinalityProofInfo};
|
||||
use pezbp_messages::{
|
||||
source_chain::FromBridgedChainMessagesDeliveryProof,
|
||||
target_chain::FromBridgedChainMessagesProof, BaseMessagesProofInfo, DeliveredMessages,
|
||||
InboundLaneData, MessageNonce, MessagesCallInfo, MessagesOperatingMode, OutboundLaneData,
|
||||
ReceiveMessagesDeliveryProofInfo, ReceiveMessagesProofInfo, UnrewardedRelayer,
|
||||
UnrewardedRelayerOccupation, UnrewardedRelayersState,
|
||||
};
|
||||
use bp_pezkuwi_core::teyrchains::{ParaHeadsProof, ParaId};
|
||||
use bp_relayers::RuntimeWithUtilityPallet;
|
||||
use bp_test_utils::{make_default_justification, test_keyring, TEST_GRANDPA_SET_ID};
|
||||
use bp_teyrchains::{BestParaHeadHash, ParaInfo, SubmitTeyrchainHeadsInfo};
|
||||
use pezbp_pezkuwi_core::teyrchains::{ParaHeadsProof, ParaId};
|
||||
use pezbp_relayers::RuntimeWithUtilityPallet;
|
||||
use pezbp_test_utils::{make_default_justification, test_keyring, TEST_GRANDPA_SET_ID};
|
||||
use pezbp_teyrchains::{BestParaHeadHash, ParaInfo, SubmitTeyrchainHeadsInfo};
|
||||
use pezbp_runtime::{BasicOperatingMode, HeaderId, Teyrchain};
|
||||
use pezframe_support::{
|
||||
__private::pezsp_tracing,
|
||||
@@ -574,7 +574,7 @@ mod tests {
|
||||
pezpallet_bridge_grandpa::BestFinalized::<TestRuntime>::put(best_relay_header);
|
||||
pezpallet_bridge_grandpa::ImportedHeaders::<TestRuntime>::insert(
|
||||
best_relay_header.hash(),
|
||||
bp_test_utils::test_header::<BridgedChainHeader>(0).build(),
|
||||
pezbp_test_utils::test_header::<BridgedChainHeader>(0).build(),
|
||||
);
|
||||
|
||||
let para_id = ParaId(TestTeyrchain::get());
|
||||
|
||||
@@ -51,7 +51,7 @@ mod integrity_tests {}
|
||||
mod integrity_tests {
|
||||
use super::{compute_priority_boost, ItemCount};
|
||||
|
||||
use bp_messages::MessageNonce;
|
||||
use pezbp_messages::MessageNonce;
|
||||
use pezbp_runtime::PreComputedSize;
|
||||
use pezframe_support::{
|
||||
dispatch::{DispatchClass, DispatchInfo, Pays, PostDispatchInfo},
|
||||
@@ -142,7 +142,7 @@ mod integrity_tests {
|
||||
pub mod per_relay_header {
|
||||
use super::*;
|
||||
|
||||
use bp_header_pez_chain::{
|
||||
use pezbp_header_pez_chain::{
|
||||
max_expected_submit_finality_proof_arguments_size, ChainWithGrandpa,
|
||||
};
|
||||
use pezpallet_bridge_grandpa::WeightInfoExt;
|
||||
@@ -334,7 +334,7 @@ mod integrity_tests {
|
||||
pub mod per_message {
|
||||
use super::*;
|
||||
|
||||
use bp_messages::ChainWithMessages;
|
||||
use pezbp_messages::ChainWithMessages;
|
||||
use pezpallet_bridge_messages::WeightInfoExt;
|
||||
|
||||
/// Ensures that the value of `PriorityBoostPerMessage` matches the value of
|
||||
|
||||
@@ -24,7 +24,7 @@ use crate::{
|
||||
Config as BridgeRelayersConfig, LOG_TARGET,
|
||||
};
|
||||
|
||||
use bp_relayers::{BatchCallUnpacker, ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
|
||||
use pezbp_relayers::{BatchCallUnpacker, ExtensionCallData, ExtensionCallInfo, ExtensionConfig};
|
||||
use core::marker::PhantomData;
|
||||
use pezbp_runtime::{StaticStrProvider, Teyrchain};
|
||||
use pezframe_support::dispatch::{DispatchInfo, PostDispatchInfo};
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
|
||||
extern crate alloc;
|
||||
|
||||
pub use bp_relayers::RewardLedger;
|
||||
use bp_relayers::{PaymentProcedure, Registration, RelayerRewardsKeyProvider, StakeAndSlash};
|
||||
pub use pezbp_relayers::RewardLedger;
|
||||
use pezbp_relayers::{PaymentProcedure, Registration, RelayerRewardsKeyProvider, StakeAndSlash};
|
||||
use core::marker::PhantomData;
|
||||
use pezbp_runtime::StorageDoubleMapKeyProvider;
|
||||
use pezframe_support::{fail, traits::tokens::Balance};
|
||||
@@ -578,8 +578,8 @@ mod tests {
|
||||
use super::*;
|
||||
use mock::{RuntimeEvent as TestEvent, *};
|
||||
|
||||
use bp_messages::{HashedLaneId, LaneIdType};
|
||||
use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
|
||||
use pezbp_messages::{HashedLaneId, LaneIdType};
|
||||
use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
|
||||
use pezframe_support::{assert_noop, assert_ok, traits::fungible::Mutate};
|
||||
use pezframe_system::{EventRecord, Pezpallet as System, Phase};
|
||||
use pezsp_runtime::DispatchError;
|
||||
@@ -637,7 +637,7 @@ mod tests {
|
||||
*b"test",
|
||||
RewardsAccountOwner::ThisChain,
|
||||
);
|
||||
let slash_destination = bp_relayers::ExplicitOrAccountParams::Params(slash_destination);
|
||||
let slash_destination = pezbp_relayers::ExplicitOrAccountParams::Params(slash_destination);
|
||||
Pezpallet::<TestRuntime>::slash_and_deregister(®ISTER_RELAYER, slash_destination);
|
||||
// check if event emitted
|
||||
assert_eq!(
|
||||
|
||||
@@ -29,7 +29,7 @@ pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
|
||||
/// (used with v1 migration).
|
||||
pub mod v0 {
|
||||
use crate::{Config, Pezpallet};
|
||||
use bp_relayers::RewardsAccountOwner;
|
||||
use pezbp_relayers::RewardsAccountOwner;
|
||||
use codec::{Codec, Decode, Encode, EncodeLike, MaxEncodedLen};
|
||||
use core::marker::PhantomData;
|
||||
use pezbp_runtime::{ChainId, StorageDoubleMapKeyProvider};
|
||||
@@ -120,8 +120,8 @@ pub mod v0 {
|
||||
pub mod v1 {
|
||||
use super::*;
|
||||
use crate::{Config, Pezpallet};
|
||||
use bp_messages::LaneIdType;
|
||||
use bp_relayers::RewardsAccountParams;
|
||||
use pezbp_messages::LaneIdType;
|
||||
use pezbp_relayers::RewardsAccountParams;
|
||||
use codec::{Codec, EncodeLike};
|
||||
use core::marker::PhantomData;
|
||||
use pezbp_runtime::StorageDoubleMapKeyProvider;
|
||||
@@ -329,8 +329,8 @@ pub mod v2 {
|
||||
#[cfg(feature = "try-runtime")]
|
||||
use crate::RelayerRewards;
|
||||
use crate::{Config, Pezpallet};
|
||||
use bp_messages::LaneIdType;
|
||||
use bp_relayers::RewardsAccountParams;
|
||||
use pezbp_messages::LaneIdType;
|
||||
use pezbp_relayers::RewardsAccountParams;
|
||||
use core::marker::PhantomData;
|
||||
use pezframe_support::traits::UncheckedOnRuntimeUpgrade;
|
||||
|
||||
|
||||
@@ -18,15 +18,15 @@
|
||||
|
||||
use crate as pezpallet_bridge_relayers;
|
||||
|
||||
use bp_header_pez_chain::ChainWithGrandpa;
|
||||
use bp_messages::{
|
||||
use pezbp_header_pez_chain::ChainWithGrandpa;
|
||||
use pezbp_messages::{
|
||||
target_chain::{DispatchMessage, MessageDispatch},
|
||||
ChainWithMessages, HashedLaneId, LaneIdType, MessageNonce,
|
||||
};
|
||||
use bp_relayers::{
|
||||
use pezbp_relayers::{
|
||||
PayRewardFromAccount, PaymentProcedure, RewardsAccountOwner, RewardsAccountParams,
|
||||
};
|
||||
use bp_teyrchains::SingleParaStoredHeaderDataBuilder;
|
||||
use pezbp_teyrchains::SingleParaStoredHeaderDataBuilder;
|
||||
use codec::Encode;
|
||||
use pezbp_runtime::{messages::MessageDispatchResult, Chain, ChainId, Teyrchain};
|
||||
use pezframe_support::{
|
||||
|
||||
@@ -20,12 +20,12 @@
|
||||
use crate::{Config, Pezpallet};
|
||||
|
||||
use alloc::collections::vec_deque::VecDeque;
|
||||
use bp_messages::{
|
||||
use pezbp_messages::{
|
||||
source_chain::{DeliveryConfirmationPayments, RelayersRewards},
|
||||
MessageNonce,
|
||||
};
|
||||
pub use bp_relayers::PayRewardFromAccount;
|
||||
use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
|
||||
pub use pezbp_relayers::PayRewardFromAccount;
|
||||
use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
|
||||
use core::{marker::PhantomData, ops::RangeInclusive};
|
||||
use pezbp_runtime::Chain;
|
||||
use pezframe_support::{pezsp_runtime::SaturatedConversion, traits::Get};
|
||||
@@ -51,11 +51,11 @@ where
|
||||
|
||||
fn pay_reward(
|
||||
lane_id: LaneIdOf<T, MI>,
|
||||
pez_messages_relayers: VecDeque<bp_messages::UnrewardedRelayer<T::AccountId>>,
|
||||
pez_messages_relayers: VecDeque<pezbp_messages::UnrewardedRelayer<T::AccountId>>,
|
||||
confirmation_relayer: &T::AccountId,
|
||||
received_range: &RangeInclusive<bp_messages::MessageNonce>,
|
||||
received_range: &RangeInclusive<pezbp_messages::MessageNonce>,
|
||||
) -> MessageNonce {
|
||||
let relayers_rewards = bp_messages::calc_relayers_rewards::<T::AccountId>(
|
||||
let relayers_rewards = pezbp_messages::calc_relayers_rewards::<T::AccountId>(
|
||||
pez_messages_relayers,
|
||||
received_range,
|
||||
);
|
||||
@@ -117,8 +117,8 @@ fn register_relayers_rewards<
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::{mock::*, RelayerRewards};
|
||||
use bp_messages::LaneIdType;
|
||||
use bp_relayers::PaymentProcedure;
|
||||
use pezbp_messages::LaneIdType;
|
||||
use pezbp_relayers::PaymentProcedure;
|
||||
use pezframe_support::{
|
||||
assert_ok,
|
||||
traits::fungible::{Inspect, Mutate},
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
//! Code that allows `NamedReservableCurrency` to be used as a `StakeAndSlash`
|
||||
//! mechanism of the relayers pezpallet.
|
||||
|
||||
use bp_relayers::StakeAndSlash;
|
||||
use pezbp_relayers::StakeAndSlash;
|
||||
use codec::Codec;
|
||||
use core::{fmt::Debug, marker::PhantomData};
|
||||
use pezframe_support::traits::{tokens::BalanceStatus, NamedReservableCurrency};
|
||||
@@ -27,7 +27,7 @@ use pezsp_runtime::{traits::Get, DispatchError, DispatchResult};
|
||||
/// reservations.
|
||||
///
|
||||
/// **WARNING**: this implementation assumes that the relayers pezpallet is configured to
|
||||
/// use the [`bp_relayers::PayRewardFromAccount`] as its relayers payment scheme.
|
||||
/// use the [`pezbp_relayers::PayRewardFromAccount`] as its relayers payment scheme.
|
||||
pub struct StakeAndSlashNamed<AccountId, BlockNumber, Currency, ReserveId, Stake, Lease>(
|
||||
PhantomData<(AccountId, BlockNumber, Currency, ReserveId, Stake, Lease)>,
|
||||
);
|
||||
@@ -72,7 +72,7 @@ where
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::mock::*;
|
||||
use bp_relayers::ExplicitOrAccountParams;
|
||||
use pezbp_relayers::ExplicitOrAccountParams;
|
||||
|
||||
use pezframe_support::traits::fungible::Mutate;
|
||||
use pezsp_runtime::traits::IdentifyAccount;
|
||||
|
||||
Reference in New Issue
Block a user