git.delta.rocks / unique-network / refs/commits / b66d0b01b670

difftreelog

fix(config) after conflicts

Daniel Shiposha2022-08-12parent: #3df3531.patch.diff
in: master

3 files changed

modifiedruntime/common/config/parachain.rsdiffbeforeafterboth
37 type ReservedDmpWeight = ReservedDmpWeight;37 type ReservedDmpWeight = ReservedDmpWeight;
38 type ReservedXcmpWeight = ReservedXcmpWeight;38 type ReservedXcmpWeight = ReservedXcmpWeight;
39 type XcmpMessageHandler = XcmpQueue;39 type XcmpMessageHandler = XcmpQueue;
40 type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
40}41}
4142
42impl parachain_info::Config for Runtime {}43impl parachain_info::Config for Runtime {}
modifiedruntime/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 {
modifiedruntime/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>;