difftreelog
fix(config) after conflicts
in: master
3 files changed
runtime/common/config/parachain.rsdiffbeforeafterboth--- a/runtime/common/config/parachain.rs
+++ b/runtime/common/config/parachain.rs
@@ -37,6 +37,7 @@
type ReservedDmpWeight = ReservedDmpWeight;
type ReservedXcmpWeight = ReservedXcmpWeight;
type XcmpMessageHandler = XcmpQueue;
+ type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
}
impl parachain_info::Config for Runtime {}
runtime/common/config/substrate.rsdiffbeforeafterboth--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -199,7 +199,6 @@
type SpendFunds = ();
type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;
type MaxApprovals = MaxApprovals;
- type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
}
impl pallet_sudo::Config for Runtime {
runtime/tests/src/lib.rsdiffbeforeafterboth270}270}271271272impl pallet_unique::Config for Test {272impl pallet_unique::Config for Test {273 type Event = ();273 type Event = Event;274 type WeightInfo = ();274 type WeightInfo = ();275 type CommonWeightInfo = CommonWeights<Self>;275 type CommonWeightInfo = CommonWeights<Self>;276 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;276 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;