Refactoring Checkpoint: (WIP)
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
//! checks.
|
||||
|
||||
use bp_relayers::ExplicitOrAccountParams;
|
||||
use bp_runtime::Teyrchain;
|
||||
use pezbp_runtime::Teyrchain;
|
||||
use bp_teyrchains::SubmitTeyrchainHeadsInfo;
|
||||
use pezpallet_bridge_grandpa::{
|
||||
BridgedBlockNumber, CallSubType as GrandpaCallSubType, SubmitFinalityProofHelper,
|
||||
@@ -374,11 +374,11 @@ macro_rules! generate_bridge_reject_obsolete_headers_and_messages {
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::mock::*;
|
||||
use bp_header_chain::StoredHeaderDataBuilder;
|
||||
use bp_header_pez_chain::StoredHeaderDataBuilder;
|
||||
use bp_messages::{InboundLaneData, MessageNonce, OutboundLaneData};
|
||||
use bp_pezkuwi_core::teyrchains::{ParaHeadsProof, ParaId};
|
||||
use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
|
||||
use bp_runtime::HeaderId;
|
||||
use pezbp_runtime::HeaderId;
|
||||
use bp_test_utils::{make_default_justification, test_keyring, TEST_GRANDPA_SET_ID};
|
||||
use bp_teyrchains::{BestParaHeadHash, ParaInfo};
|
||||
use codec::{Decode, Encode, MaxEncodedLen};
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
//! Most of the tests in this module assume that the bridge is using standard (see `crate::messages`
|
||||
//! module for details) configuration.
|
||||
|
||||
use bp_header_chain::ChainWithGrandpa;
|
||||
use bp_header_pez_chain::ChainWithGrandpa;
|
||||
use bp_messages::{ChainWithMessages, InboundLaneData, MessageNonce};
|
||||
use bp_runtime::{AccountIdOf, Chain};
|
||||
use pezbp_runtime::{AccountIdOf, Chain};
|
||||
use codec::Encode;
|
||||
use pezframe_support::{storage::generator::StorageValue, traits::Get, weights::Weight};
|
||||
use pezframe_system::limits;
|
||||
@@ -46,12 +46,12 @@ macro_rules! assert_chain_types(
|
||||
// configuration is used), or something has broke existing configuration (meaning that all bridged chains
|
||||
// and relays will stop functioning)
|
||||
|
||||
assert_type_eq_all!(<$r as SystemConfig>::Nonce, bp_runtime::NonceOf<$this>);
|
||||
assert_type_eq_all!(BlockNumberFor<$r>, bp_runtime::BlockNumberOf<$this>);
|
||||
assert_type_eq_all!(<$r as SystemConfig>::Hash, bp_runtime::HashOf<$this>);
|
||||
assert_type_eq_all!(<$r as SystemConfig>::Hashing, bp_runtime::HasherOf<$this>);
|
||||
assert_type_eq_all!(<$r as SystemConfig>::AccountId, bp_runtime::AccountIdOf<$this>);
|
||||
assert_type_eq_all!(HeaderFor<$r>, bp_runtime::HeaderOf<$this>);
|
||||
assert_type_eq_all!(<$r as SystemConfig>::Nonce, pezbp_runtime::NonceOf<$this>);
|
||||
assert_type_eq_all!(BlockNumberFor<$r>, pezbp_runtime::BlockNumberOf<$this>);
|
||||
assert_type_eq_all!(<$r as SystemConfig>::Hash, pezbp_runtime::HashOf<$this>);
|
||||
assert_type_eq_all!(<$r as SystemConfig>::Hashing, pezbp_runtime::HasherOf<$this>);
|
||||
assert_type_eq_all!(<$r as SystemConfig>::AccountId, pezbp_runtime::AccountIdOf<$this>);
|
||||
assert_type_eq_all!(HeaderFor<$r>, pezbp_runtime::HeaderOf<$this>);
|
||||
}
|
||||
}
|
||||
);
|
||||
@@ -70,7 +70,7 @@ macro_rules! assert_bridge_messages_pallet_types(
|
||||
{
|
||||
use $crate::integrity::__private::static_assertions::assert_type_eq_all;
|
||||
use bp_messages::ChainWithMessages;
|
||||
use bp_runtime::Chain;
|
||||
use pezbp_runtime::Chain;
|
||||
use pezpallet_bridge_messages::Config as BridgeMessagesConfig;
|
||||
|
||||
// if one of asserts fail, then either bridge isn't configured properly (or alternatively - non-standard
|
||||
@@ -203,7 +203,7 @@ where
|
||||
// check that the bridge GRANDPA pallet has required name
|
||||
assert_eq!(
|
||||
pezpallet_bridge_grandpa::PalletOwner::<R, GI>::storage_value_final_key().to_vec(),
|
||||
bp_runtime::storage_value_key(
|
||||
pezbp_runtime::storage_value_key(
|
||||
params.with_bridged_chain_grandpa_pallet_name,
|
||||
"PalletOwner",
|
||||
)
|
||||
@@ -211,7 +211,7 @@ where
|
||||
);
|
||||
assert_eq!(
|
||||
pezpallet_bridge_grandpa::PalletOperatingMode::<R, GI>::storage_value_final_key().to_vec(),
|
||||
bp_runtime::storage_value_key(
|
||||
pezbp_runtime::storage_value_key(
|
||||
params.with_bridged_chain_grandpa_pallet_name,
|
||||
"PalletOperatingMode",
|
||||
)
|
||||
@@ -237,7 +237,7 @@ where
|
||||
// check that the bridge messages pallet has required name
|
||||
assert_eq!(
|
||||
pezpallet_bridge_messages::PalletOwner::<R, MI>::storage_value_final_key().to_vec(),
|
||||
bp_runtime::storage_value_key(
|
||||
pezbp_runtime::storage_value_key(
|
||||
params.with_bridged_chain_messages_pallet_name,
|
||||
"PalletOwner",
|
||||
)
|
||||
@@ -245,7 +245,7 @@ where
|
||||
);
|
||||
assert_eq!(
|
||||
pezpallet_bridge_messages::PalletOperatingMode::<R, MI>::storage_value_final_key().to_vec(),
|
||||
bp_runtime::storage_value_key(
|
||||
pezbp_runtime::storage_value_key(
|
||||
params.with_bridged_chain_messages_pallet_name,
|
||||
"PalletOperatingMode",
|
||||
)
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
// along with Parity Bridges Common. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
//! Everything required to run benchmarks of messages module, based on
|
||||
//! `bridge_runtime_common::messages` implementation.
|
||||
//! `pezbridge_runtime_common::messages` implementation.
|
||||
|
||||
#![cfg(feature = "runtime-benchmarks")]
|
||||
|
||||
@@ -24,7 +24,7 @@ use bp_messages::{
|
||||
target_chain::FromBridgedChainMessagesProof, MessagePayload,
|
||||
};
|
||||
use bp_pezkuwi_core::teyrchains::ParaHash;
|
||||
use bp_runtime::{AccountIdOf, Chain, HashOf, Teyrchain};
|
||||
use pezbp_runtime::{AccountIdOf, Chain, HashOf, Teyrchain};
|
||||
use codec::Encode;
|
||||
use pezframe_support::weights::Weight;
|
||||
use pezpallet_bridge_messages::{
|
||||
@@ -236,15 +236,15 @@ where
|
||||
|
||||
/// Insert header to the bridge GRANDPA pallet.
|
||||
pub(crate) fn insert_header_to_grandpa_pallet<R, GI>(
|
||||
state_root: bp_runtime::HashOf<R::BridgedChain>,
|
||||
) -> (bp_runtime::BlockNumberOf<R::BridgedChain>, bp_runtime::HashOf<R::BridgedChain>)
|
||||
state_root: pezbp_runtime::HashOf<R::BridgedChain>,
|
||||
) -> (pezbp_runtime::BlockNumberOf<R::BridgedChain>, pezbp_runtime::HashOf<R::BridgedChain>)
|
||||
where
|
||||
R: pezpallet_bridge_grandpa::Config<GI>,
|
||||
GI: 'static,
|
||||
R::BridgedChain: bp_runtime::Chain,
|
||||
R::BridgedChain: pezbp_runtime::Chain,
|
||||
{
|
||||
let bridged_block_number = Zero::zero();
|
||||
let bridged_header = bp_runtime::HeaderOf::<R::BridgedChain>::new(
|
||||
let bridged_header = pezbp_runtime::HeaderOf::<R::BridgedChain>::new(
|
||||
bridged_block_number,
|
||||
Default::default(),
|
||||
state_root,
|
||||
@@ -258,15 +258,15 @@ where
|
||||
|
||||
/// Insert header to the bridge teyrchains pallet.
|
||||
pub(crate) fn insert_header_to_teyrchains_pallet<R, PI, PC>(
|
||||
state_root: bp_runtime::HashOf<PC>,
|
||||
) -> (bp_runtime::BlockNumberOf<PC>, bp_runtime::HashOf<PC>)
|
||||
state_root: pezbp_runtime::HashOf<PC>,
|
||||
) -> (pezbp_runtime::BlockNumberOf<PC>, pezbp_runtime::HashOf<PC>)
|
||||
where
|
||||
R: pezpallet_bridge_teyrchains::Config<PI>,
|
||||
PI: 'static,
|
||||
PC: Chain<Hash = ParaHash> + Teyrchain,
|
||||
{
|
||||
let bridged_block_number = Zero::zero();
|
||||
let bridged_header = bp_runtime::HeaderOf::<PC>::new(
|
||||
let bridged_header = pezbp_runtime::HeaderOf::<PC>::new(
|
||||
bridged_block_number,
|
||||
Default::default(),
|
||||
state_root,
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
#![cfg(test)]
|
||||
|
||||
use bp_header_chain::ChainWithGrandpa;
|
||||
use bp_header_pez_chain::ChainWithGrandpa;
|
||||
use bp_messages::{
|
||||
target_chain::{DispatchMessage, MessageDispatch},
|
||||
ChainWithMessages, HashedLaneId, LaneIdType, MessageNonce,
|
||||
};
|
||||
use bp_relayers::{PayRewardFromAccount, RewardsAccountParams};
|
||||
use bp_runtime::{messages::MessageDispatchResult, Chain, ChainId, Teyrchain};
|
||||
use pezbp_runtime::{messages::MessageDispatchResult, Chain, ChainId, Teyrchain};
|
||||
use bp_teyrchains::SingleParaStoredHeaderDataBuilder;
|
||||
use codec::Encode;
|
||||
use pezframe_support::{
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
use crate::messages_benchmarking::insert_header_to_grandpa_pallet;
|
||||
|
||||
use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
|
||||
use bp_runtime::{grow_storage_value, record_all_trie_keys, Chain, UnverifiedStorageProofParams};
|
||||
use pezbp_runtime::{grow_storage_value, record_all_trie_keys, Chain, UnverifiedStorageProofParams};
|
||||
use bp_teyrchains::{
|
||||
teyrchain_head_storage_key_at_source, RelayBlockHash, RelayBlockHasher, RelayBlockNumber,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user