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
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
270}270}
271271
272impl 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>;