diff --git a/bridges/bin/runtime-common/src/mock.rs b/bridges/bin/runtime-common/src/mock.rs
index 943a98284a5e7e9782d2c0553b53b1588929274c..ffabf7f6e2f84bc43e8ac7e90ac90287c5ec39ca 100644
--- a/bridges/bin/runtime-common/src/mock.rs
+++ b/bridges/bin/runtime-common/src/mock.rs
@@ -39,13 +39,13 @@ use bp_runtime::{
};
use codec::{Decode, Encode};
use frame_support::{
- parameter_types,
+ derive_impl, parameter_types,
weights::{ConstantMultiplier, IdentityFee, RuntimeDbWeight, Weight},
};
use pallet_transaction_payment::Multiplier;
use sp_runtime::{
testing::H256,
- traits::{BlakeTwo256, ConstU32, ConstU64, ConstU8, IdentityLookup},
+ traits::{BlakeTwo256, ConstU32, ConstU64, ConstU8},
FixedPointNumber, Perquintill,
};
@@ -141,30 +141,14 @@ parameter_types! {
pub const ReserveId: [u8; 8] = *b"brdgrlrs";
}
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for TestRuntime {
- type RuntimeOrigin = RuntimeOrigin;
- type Nonce = u64;
- type RuntimeCall = RuntimeCall;
type Hash = ThisChainHash;
type Hashing = ThisChainHasher;
type AccountId = ThisChainAccountId;
- type Lookup = IdentityLookup<Self::AccountId>;
type Block = ThisChainBlock;
- type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU32<250>;
- type Version = ();
- type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<ThisChainBalance>;
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type BaseCallFilter = frame_support::traits::Everything;
- type SystemWeightInfo = ();
- type BlockWeights = ();
- type BlockLength = ();
- type DbWeight = DbWeight;
- type SS58Prefix = ();
- type OnSetCode = ();
- type MaxConsumers = frame_support::traits::ConstU32<16>;
+ type BlockHashCount = ConstU32<250>;
}
impl pallet_utility::Config for TestRuntime {
@@ -174,20 +158,10 @@ impl pallet_utility::Config for TestRuntime {
type WeightInfo = ();
}
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
impl pallet_balances::Config for TestRuntime {
- type Balance = ThisChainBalance;
- type RuntimeEvent = RuntimeEvent;
- type DustRemoval = ();
- type ExistentialDeposit = ExistentialDeposit;
- type AccountStore = System;
- type WeightInfo = ();
- type MaxLocks = ConstU32<50>;
- type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8];
- type RuntimeHoldReason = RuntimeHoldReason;
- type FreezeIdentifier = ();
- type MaxHolds = ConstU32<0>;
- type MaxFreezes = ConstU32<0>;
+ type AccountStore = System;
}
impl pallet_transaction_payment::Config for TestRuntime {
diff --git a/bridges/modules/beefy/src/mock.rs b/bridges/modules/beefy/src/mock.rs
index 3985d25c32f070ec230d6b60c3474dc6e61f0798..0b0084609cc55960a6760f6ede4523f7d944ca2e 100644
--- a/bridges/modules/beefy/src/mock.rs
+++ b/bridges/modules/beefy/src/mock.rs
@@ -24,12 +24,11 @@ use crate::{
use bp_beefy::{BeefyValidatorSignatureOf, ChainWithBeefy, Commitment, MmrDataOrHash};
use bp_runtime::{BasicOperatingMode, Chain};
use codec::Encode;
-use frame_support::{construct_runtime, parameter_types, traits::ConstU64, weights::Weight};
+use frame_support::{construct_runtime, derive_impl, weights::Weight};
use sp_core::{sr25519::Signature, Pair};
use sp_runtime::{
testing::{Header, H256},
- traits::{BlakeTwo256, Hash, IdentityLookup},
- Perbill,
+ traits::{BlakeTwo256, Hash},
};
pub use sp_consensus_beefy::ecdsa_crypto::{AuthorityId as BeefyId, Pair as BeefyPair};
@@ -67,36 +66,9 @@ construct_runtime! {
}
}
-parameter_types! {
- pub const MaximumBlockWeight: Weight = Weight::from_parts(1024, 0);
- pub const MaximumBlockLength: u32 = 2 * 1024;
- pub const AvailableBlockRatio: Perbill = Perbill::one();
-}
-
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for TestRuntime {
- type RuntimeOrigin = RuntimeOrigin;
- type Nonce = u64;
- type RuntimeCall = RuntimeCall;
type Block = Block;
- type Hash = H256;
- type Hashing = BlakeTwo256;
- type AccountId = TestAccountId;
- type Lookup = IdentityLookup<Self::AccountId>;
- type RuntimeEvent = ();
- type BlockHashCount = ConstU64<250>;
- type Version = ();
- type PalletInfo = PalletInfo;
- type AccountData = ();
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type BaseCallFilter = frame_support::traits::Everything;
- type SystemWeightInfo = ();
- type DbWeight = ();
- type BlockWeights = ();
- type BlockLength = ();
- type SS58Prefix = ();
- type OnSetCode = ();
- type MaxConsumers = frame_support::traits::ConstU32<16>;
}
impl beefy::Config for TestRuntime {
diff --git a/bridges/modules/grandpa/src/mock.rs b/bridges/modules/grandpa/src/mock.rs
index f88a0a3e6a6ee187222a6fb8eb1628e22b37abbe..7efa84971fe7f319146a62fe5b07d2de0e75e48d 100644
--- a/bridges/modules/grandpa/src/mock.rs
+++ b/bridges/modules/grandpa/src/mock.rs
@@ -20,16 +20,9 @@
use bp_header_chain::ChainWithGrandpa;
use bp_runtime::Chain;
use frame_support::{
- construct_runtime, parameter_types,
- traits::{ConstU32, ConstU64, Hooks},
- weights::Weight,
+ construct_runtime, derive_impl, parameter_types, traits::Hooks, weights::Weight,
};
use sp_core::sr25519::Signature;
-use sp_runtime::{
- testing::H256,
- traits::{BlakeTwo256, IdentityLookup},
- Perbill,
-};
pub type AccountId = u64;
pub type TestHeader = sp_runtime::testing::Header;
@@ -49,43 +42,14 @@ construct_runtime! {
}
}
-parameter_types! {
- pub const MaximumBlockWeight: Weight = Weight::from_parts(1024, 0);
- pub const MaximumBlockLength: u32 = 2 * 1024;
- pub const AvailableBlockRatio: Perbill = Perbill::one();
-}
-
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for TestRuntime {
- type RuntimeOrigin = RuntimeOrigin;
- type Nonce = u64;
- type RuntimeCall = RuntimeCall;
- type Hash = H256;
- type Hashing = BlakeTwo256;
- type AccountId = AccountId;
- type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
- type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
- type Version = ();
- type PalletInfo = PalletInfo;
- type AccountData = ();
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type BaseCallFilter = frame_support::traits::Everything;
- type SystemWeightInfo = ();
- type DbWeight = ();
- type BlockWeights = ();
- type BlockLength = ();
- type SS58Prefix = ();
- type OnSetCode = ();
- type MaxConsumers = ConstU32<16>;
}
parameter_types! {
pub const MaxFreeMandatoryHeadersPerBlock: u32 = 2;
pub const HeadersToKeep: u32 = 5;
- pub const SessionLength: u64 = 5;
- pub const NumValidators: u32 = 5;
}
impl grandpa::Config for TestRuntime {
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
index e24cab3e587bb040bb2dda66e9eccfb55722cf69..05cc60b374bf3fd8af05e520ffbbb3a3349ed4cb 100644
--- a/bridges/modules/messages/Cargo.toml
+++ b/bridges/modules/messages/Cargo.toml
@@ -22,7 +22,6 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
@@ -43,7 +42,6 @@ std = [
"log/std",
"num-traits/std",
"scale-info/std",
- "sp-core/std",
"sp-runtime/std",
"sp-std/std",
]
diff --git a/bridges/modules/messages/src/mock.rs b/bridges/modules/messages/src/mock.rs
index aebb7eafa7871d13cd8140d5a352978ca36433dd..648acad772d7a04b2985f69d038d5c52634c4708 100644
--- a/bridges/modules/messages/src/mock.rs
+++ b/bridges/modules/messages/src/mock.rs
@@ -34,16 +34,11 @@ use bp_messages::{
use bp_runtime::{messages::MessageDispatchResult, Size};
use codec::{Decode, Encode};
use frame_support::{
- parameter_types,
- traits::ConstU64,
+ derive_impl, parameter_types,
weights::{constants::RocksDbWeight, Weight},
};
use scale_info::TypeInfo;
-use sp_core::H256;
-use sp_runtime::{
- traits::{BlakeTwo256, ConstU32, IdentityLookup},
- BuildStorage, Perbill,
-};
+use sp_runtime::BuildStorage;
use std::{
collections::{BTreeMap, VecDeque},
ops::RangeInclusive,
@@ -84,55 +79,19 @@ frame_support::construct_runtime! {
}
}
-parameter_types! {
- pub const BlockHashCount: u64 = 250;
- pub const MaximumBlockWeight: Weight = Weight::from_parts(1024, 0);
- pub const MaximumBlockLength: u32 = 2 * 1024;
- pub const AvailableBlockRatio: Perbill = Perbill::one();
-}
-
pub type DbWeight = RocksDbWeight;
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for TestRuntime {
- type RuntimeOrigin = RuntimeOrigin;
- type Nonce = u64;
- type RuntimeCall = RuntimeCall;
- type Hash = H256;
- type Hashing = BlakeTwo256;
- type AccountId = AccountId;
- type Lookup = IdentityLookup<Self::AccountId>;
type Block = Block;
- type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = ConstU64<250>;
- type Version = ();
- type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<Balance>;
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type BaseCallFilter = frame_support::traits::Everything;
- type SystemWeightInfo = ();
- type BlockWeights = ();
- type BlockLength = ();
type DbWeight = DbWeight;
- type SS58Prefix = ();
- type OnSetCode = ();
- type MaxConsumers = frame_support::traits::ConstU32<16>;
}
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
impl pallet_balances::Config for TestRuntime {
- type MaxLocks = ();
- type Balance = Balance;
- type DustRemoval = ();
- type RuntimeEvent = RuntimeEvent;
- type ExistentialDeposit = ConstU64<1>;
- type AccountStore = frame_system::Pallet<TestRuntime>;
- type WeightInfo = ();
- type MaxReserves = ();
- type ReserveIdentifier = ();
- type RuntimeHoldReason = RuntimeHoldReason;
- type FreezeIdentifier = ();
- type MaxHolds = ConstU32<0>;
- type MaxFreezes = ConstU32<0>;
+ type ReserveIdentifier = [u8; 8];
+ type AccountStore = System;
}
parameter_types! {
diff --git a/bridges/modules/parachains/src/mock.rs b/bridges/modules/parachains/src/mock.rs
index 14afe38417105a789f9eb13ca913c1be91e6f789..d95e76f31086251ac7ee8671e379d55e0afbb8f2 100644
--- a/bridges/modules/parachains/src/mock.rs
+++ b/bridges/modules/parachains/src/mock.rs
@@ -17,17 +17,18 @@
use bp_header_chain::ChainWithGrandpa;
use bp_polkadot_core::parachains::ParaId;
use bp_runtime::{Chain, Parachain};
-use frame_support::{construct_runtime, parameter_types, traits::ConstU32, weights::Weight};
+use frame_support::{
+ construct_runtime, derive_impl, parameter_types, traits::ConstU32, weights::Weight,
+};
use sp_runtime::{
testing::H256,
- traits::{BlakeTwo256, Header as HeaderT, IdentityLookup},
- MultiSignature, Perbill,
+ traits::{BlakeTwo256, Header as HeaderT},
+ MultiSignature,
};
use crate as pallet_bridge_parachains;
pub type AccountId = u64;
-pub type TestNumber = u64;
pub type RelayBlockHeader =
sp_runtime::generic::Header<crate::RelayBlockNumber, crate::RelayBlockHasher>;
@@ -152,42 +153,12 @@ construct_runtime! {
}
}
-parameter_types! {
- pub const BlockHashCount: TestNumber = 250;
- pub const MaximumBlockWeight: Weight = Weight::from_parts(1024, 0);
- pub const MaximumBlockLength: u32 = 2 * 1024;
- pub const AvailableBlockRatio: Perbill = Perbill::one();
-}
-
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for TestRuntime {
- type RuntimeOrigin = RuntimeOrigin;
- type Nonce = u64;
- type RuntimeCall = RuntimeCall;
type Block = Block;
- type Hash = H256;
- type Hashing = RegularParachainHasher;
- type AccountId = AccountId;
- type Lookup = IdentityLookup<Self::AccountId>;
- type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = BlockHashCount;
- type Version = ();
- type PalletInfo = PalletInfo;
- type AccountData = ();
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type BaseCallFilter = frame_support::traits::Everything;
- type SystemWeightInfo = ();
- type DbWeight = ();
- type BlockWeights = ();
- type BlockLength = ();
- type SS58Prefix = ();
- type OnSetCode = ();
- type MaxConsumers = ConstU32<16>;
}
parameter_types! {
- pub const SessionLength: u64 = 5;
- pub const NumValidators: u32 = 5;
pub const HeadersToKeep: u32 = 5;
}
diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml
index 6e00ee99cebb7ed5f128ce3f15104573d820191a..e998177694aa35a876de500f91e819808d307ec6 100644
--- a/bridges/modules/relayers/Cargo.toml
+++ b/bridges/modules/relayers/Cargo.toml
@@ -30,7 +30,6 @@ sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
[dev-dependencies]
bp-runtime = { path = "../../primitives/runtime" }
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
diff --git a/bridges/modules/relayers/src/mock.rs b/bridges/modules/relayers/src/mock.rs
index 4713ec91658afa9ad4e0c2d13055a0921cf1be88..667b10e5c125ed74bad2aa7796756f372578c2ce 100644
--- a/bridges/modules/relayers/src/mock.rs
+++ b/bridges/modules/relayers/src/mock.rs
@@ -22,12 +22,10 @@ use bp_messages::LaneId;
use bp_relayers::{
PayRewardFromAccount, PaymentProcedure, RewardsAccountOwner, RewardsAccountParams,
};
-use frame_support::{parameter_types, traits::fungible::Mutate, weights::RuntimeDbWeight};
-use sp_core::H256;
-use sp_runtime::{
- traits::{BlakeTwo256, ConstU32, IdentityLookup},
- BuildStorage,
+use frame_support::{
+ derive_impl, parameter_types, traits::fungible::Mutate, weights::RuntimeDbWeight,
};
+use sp_runtime::BuildStorage;
pub type AccountId = u64;
pub type Balance = u64;
@@ -61,46 +59,17 @@ parameter_types! {
pub const Lease: BlockNumber = 8;
}
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for TestRuntime {
- type RuntimeOrigin = RuntimeOrigin;
- type Nonce = u64;
- type RuntimeCall = RuntimeCall;
type Block = Block;
- type Hash = H256;
- type Hashing = BlakeTwo256;
- type AccountId = AccountId;
- type Lookup = IdentityLookup<Self::AccountId>;
- type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = frame_support::traits::ConstU64<250>;
- type Version = ();
- type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<Balance>;
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type BaseCallFilter = frame_support::traits::Everything;
- type SystemWeightInfo = ();
- type BlockWeights = ();
- type BlockLength = ();
type DbWeight = DbWeight;
- type SS58Prefix = ();
- type OnSetCode = ();
- type MaxConsumers = frame_support::traits::ConstU32<16>;
}
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
impl pallet_balances::Config for TestRuntime {
- type MaxLocks = ();
- type Balance = Balance;
- type DustRemoval = ();
- type RuntimeEvent = RuntimeEvent;
- type ExistentialDeposit = ExistentialDeposit;
- type AccountStore = frame_system::Pallet<TestRuntime>;
- type WeightInfo = ();
- type MaxReserves = ConstU32<1>;
type ReserveIdentifier = [u8; 8];
- type RuntimeHoldReason = RuntimeHoldReason;
- type FreezeIdentifier = ();
- type MaxHolds = ConstU32<0>;
- type MaxFreezes = ConstU32<0>;
+ type AccountStore = System;
}
impl pallet_bridge_relayers::Config for TestRuntime {
diff --git a/bridges/modules/xcm-bridge-hub-router/src/mock.rs b/bridges/modules/xcm-bridge-hub-router/src/mock.rs
index 2152b4eb28f336d86fcd531077c8ea65a3138fe5..2d173ebc0457a941c9f9038a9c1768c367cff362 100644
--- a/bridges/modules/xcm-bridge-hub-router/src/mock.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/mock.rs
@@ -19,13 +19,9 @@
use crate as pallet_xcm_bridge_hub_router;
use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
-use frame_support::{construct_runtime, parameter_types};
+use frame_support::{construct_runtime, derive_impl, parameter_types};
use frame_system::EnsureRoot;
-use sp_core::H256;
-use sp_runtime::{
- traits::{BlakeTwo256, ConstU128, IdentityLookup},
- BuildStorage,
-};
+use sp_runtime::{traits::ConstU128, BuildStorage};
use xcm::prelude::*;
use xcm_builder::{NetworkExportTable, NetworkExportTableItem};
@@ -64,30 +60,9 @@ parameter_types! {
];
}
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for TestRuntime {
- type RuntimeOrigin = RuntimeOrigin;
- type Nonce = u64;
- type RuntimeCall = RuntimeCall;
type Block = Block;
- type Hash = H256;
- type Hashing = BlakeTwo256;
- type AccountId = AccountId;
- type Lookup = IdentityLookup<Self::AccountId>;
- type RuntimeEvent = RuntimeEvent;
- type BlockHashCount = frame_support::traits::ConstU64<250>;
- type Version = ();
- type PalletInfo = PalletInfo;
- type AccountData = ();
- type OnNewAccount = ();
- type OnKilledAccount = ();
- type BaseCallFilter = frame_support::traits::Everything;
- type SystemWeightInfo = ();
- type BlockWeights = ();
- type BlockLength = ();
- type DbWeight = ();
- type SS58Prefix = ();
- type OnSetCode = ();
- type MaxConsumers = frame_support::traits::ConstU32<16>;
}
impl pallet_xcm_bridge_hub_router::Config<()> for TestRuntime {
diff --git a/bridges/primitives/relayers/Cargo.toml b/bridges/primitives/relayers/Cargo.toml
index db381836e98ac01e8cb024c90960987906a0a94e..927e3e905baaa661f7e923213c10e2fbaa49aac5 100644
--- a/bridges/primitives/relayers/Cargo.toml
+++ b/bridges/primitives/relayers/Cargo.toml
@@ -30,7 +30,9 @@ default = [ "std" ]
std = [
"bp-messages/std",
"bp-runtime/std",
+ "codec/std",
"frame-support/std",
+ "scale-info/std",
"sp-runtime/std",
"sp-std/std",
]
diff --git a/bridges/primitives/relayers/src/lib.rs b/bridges/primitives/relayers/src/lib.rs
index c529eea536d73e91aa4293aa23813f9273f6f8b5..c808c437b54cbaaa5813067a6413fe7189336ee6 100644
--- a/bridges/primitives/relayers/src/lib.rs
+++ b/bridges/primitives/relayers/src/lib.rs
@@ -115,7 +115,7 @@ where
impl<T, Relayer> PaymentProcedure<Relayer, T::Balance> for PayRewardFromAccount<T, Relayer>
where
T: frame_support::traits::fungible::Mutate<Relayer>,
- Relayer: Decode + Encode,
+ Relayer: Decode + Encode + Eq,
{
type Error = sp_runtime::DispatchError;