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.rsdiffbeforeafterboth199 type SpendFunds = ();199 type SpendFunds = ();200 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;200 type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;201 type MaxApprovals = MaxApprovals;201 type MaxApprovals = MaxApprovals;202 type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;203}202}204203205impl pallet_sudo::Config for Runtime {204impl pallet_sudo::Config for Runtime {runtime/tests/src/lib.rsdiffbeforeafterboth--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -270,7 +270,7 @@
}
impl pallet_unique::Config for Test {
- type Event = ();
+ type Event = Event;
type WeightInfo = ();
type CommonWeightInfo = CommonWeights<Self>;
type RefungibleExtensionsWeightInfo = CommonWeights<Self>;