difftreelog
fix(config) after conflicts
in: master
3 files changed
runtime/common/config/parachain.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use frame_support::{weights::Weight, parameter_types};18use crate::{Runtime, Event, XcmpQueue, DmpQueue};19use up_common::constants::*;2021parameter_types! {22 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;23 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;24}2526impl cumulus_pallet_parachain_system::Config for Runtime {27 type Event = Event;28 type SelfParaId = parachain_info::Pallet<Self>;29 type OnSystemEvent = ();30 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<31 // MaxDownwardMessageWeight,32 // XcmExecutor<XcmConfig>,33 // Call,34 // >;35 type OutboundXcmpMessageSource = XcmpQueue;36 type DmpMessageHandler = DmpQueue;37 type ReservedDmpWeight = ReservedDmpWeight;38 type ReservedXcmpWeight = ReservedXcmpWeight;39 type XcmpMessageHandler = XcmpQueue;40}4142impl parachain_info::Config for Runtime {}4344impl cumulus_pallet_aura_ext::Config for Runtime {}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use frame_support::{weights::Weight, parameter_types};18use crate::{Runtime, Event, XcmpQueue, DmpQueue};19use up_common::constants::*;2021parameter_types! {22 pub const ReservedDmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;23 pub const ReservedXcmpWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 4;24}2526impl cumulus_pallet_parachain_system::Config for Runtime {27 type Event = Event;28 type SelfParaId = parachain_info::Pallet<Self>;29 type OnSystemEvent = ();30 // type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<31 // MaxDownwardMessageWeight,32 // XcmExecutor<XcmConfig>,33 // Call,34 // >;35 type OutboundXcmpMessageSource = XcmpQueue;36 type DmpMessageHandler = DmpQueue;37 type ReservedDmpWeight = ReservedDmpWeight;38 type ReservedXcmpWeight = ReservedXcmpWeight;39 type XcmpMessageHandler = XcmpQueue;40 type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;41}4243impl parachain_info::Config for Runtime {}4445impl cumulus_pallet_aura_ext::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.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>;