Skip to content

Commit

Permalink
Merge branch 'feature_integrate_upgrade' of github.com:NodleCode/chai…
Browse files Browse the repository at this point in the history
…n into feature_integrate_upgrade
  • Loading branch information
simonsso committed Feb 26, 2024
2 parents 87ff2cf + 14ee79e commit 43024bd
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
3 changes: 0 additions & 3 deletions runtimes/eden/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -421,9 +421,6 @@ sp_api::impl_runtime_apis! {
fn dispatch_benchmark(
config: frame_benchmarking::BenchmarkConfig,
) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
// We did not include the offences and sessions benchmarks as they are parity
// specific and were causing some issues at compile time as they depend on the
// presence of the staking and elections pallets.
use cumulus_primitives_core::{Fungibility::Fungible, MultiAsset, MultiLocation, Parent};
use frame_benchmarking::{Benchmarking, BenchmarkBatch,BenchmarkError};

Expand Down
9 changes: 0 additions & 9 deletions runtimes/eden/src/pallets_parachain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ parameter_types! {
pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
}

// impl cumulus_pallet_dmp_queue::Config for Runtime {
// type RuntimeEvent = RuntimeEvent;
// type DmpSink = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
// type WeightInfo = (); // TODO check this ()
// }

impl pallet_message_queue::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type WeightInfo = ();
Expand Down Expand Up @@ -80,9 +74,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
type XcmpMessageHandler = XcmpQueue;
type ReservedXcmpWeight = ();
type CheckAssociatedRelayNumber = RelayNumberStrictlyIncreases;
// TODO cleanup and check
// type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
// type DmpQueue = frame_support::traits::EnqueueWithOrigin<(), sp_core::ConstU8<0>>;
type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
type WeightInfo = ();
}
Expand Down

0 comments on commit 43024bd

Please sign in to comment.