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
--- 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 {}
modifiedruntime/common/config/substrate.rsdiffbeforeafterboth
199 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}
204203
205impl pallet_sudo::Config for Runtime {204impl 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>;