Skip to content

Commit

Permalink
Merge branch 'main' into fix-snowbridge-benchmarks
Browse files Browse the repository at this point in the history
  • Loading branch information
claravanstaden authored Mar 25, 2024
2 parents 1210322 + 0d3c832 commit 51149f9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion system-parachains/coretime/coretime-kusama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ cumulus-pallet-xcmp-queue = { default-features = false , version = "0.8.0" }
cumulus-primitives-aura = { default-features = false, version = "0.8.0" }
cumulus-primitives-core = { default-features = false , version = "0.8.0" }
cumulus-primitives-utility = { default-features = false , version = "0.8.1" }
emulated-integration-tests-common = { version = "4.0.0" }
pallet-collator-selection = { default-features = false , version = "10.0.0" }
parachain-info = { package = "staging-parachain-info", default-features = false , version = "0.8.0" }
parachains-common = { default-features = false , version = "8.0.0" }
Expand Down Expand Up @@ -203,3 +202,8 @@ try-runtime = [
experimental = ["pallet-aura/experimental"]

fast-runtime = []

# A feature that should be enabled when the runtime should be built for on-chain
# deployment. This will disable stuff that shouldn't be part of the on-chain wasm
# to make it smaller, like logging for example.
on-chain-release-build = [ "sp-api/disable-logging" ]
2 changes: 1 addition & 1 deletion system-parachains/coretime/coretime-kusama/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use frame_support::{
assert_ok,
traits::{
fungible::{Inspect, Mutate},
Get, OnInitialize,
OnInitialize,
},
};
use pallet_broker::{AdaptPrice, ConfigRecordOf, SaleInfo};
Expand Down

0 comments on commit 51149f9

Please sign in to comment.