Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pallets/pallet-deposit-storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
]
try-runtime = []
try-runtime = ["frame-support/try-runtime"]
2 changes: 1 addition & 1 deletion pallets/pallet-dip-provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ std = [
"sp-runtime?/std",
]

try-runtime = [ "did/try-runtime", "frame-support/try-runtime", "kilt-support/try-runtime" ]
try-runtime = ["frame-support/try-runtime"]
5 changes: 1 addition & 4 deletions pallets/pallet-relay-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,4 @@ runtime-benchmarks = [
"frame-benchmarking",
"sp-runtime/runtime-benchmarks",
]
try-runtime = [
"frame-support/try-runtime",
"frame-system/try-runtime",
]
try-runtime = ["frame-support/try-runtime"]
21 changes: 5 additions & 16 deletions runtimes/peregrine/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ use frame_support::{
use frame_system::{pallet_prelude::BlockNumberFor, EnsureRoot, EnsureSigned};
use parity_scale_codec::{Decode, Encode, MaxEncodedLen};

#[cfg(feature = "try-runtime")]
use frame_try_runtime::UpgradeCheckSelect;

use sp_api::impl_runtime_apis;
use sp_core::{ConstBool, OpaqueMetadata};
use sp_runtime::{
Expand Down Expand Up @@ -64,14 +61,6 @@ use runtime_common::{
FeeSplit, Hash, Header, Nonce, Signature, SlowAdjustingFeeUpdate,
};

#[cfg(feature = "std")]
use sp_version::NativeVersion;
#[cfg(feature = "runtime-benchmarks")]
use {kilt_support::signature::AlwaysVerify, runtime_common::benchmarks::DummySignature};

#[cfg(any(feature = "std", test))]
pub use sp_runtime::BuildStorage;

#[cfg(test)]
mod tests;

Expand Down Expand Up @@ -101,8 +90,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
/// The version information used to identify this runtime when compiled
/// natively.
#[cfg(feature = "std")]
pub fn native_version() -> NativeVersion {
NativeVersion {
pub fn native_version() -> sp_version::NativeVersion {
sp_version::NativeVersion {
runtime_version: VERSION,
can_author_with: Default::default(),
}
Expand Down Expand Up @@ -559,9 +548,9 @@ impl delegation::Config for Runtime {
type Signature = did::DidSignature;

#[cfg(feature = "runtime-benchmarks")]
type Signature = DummySignature;
type Signature = runtime_common::benchmarks::DummySignature;
#[cfg(feature = "runtime-benchmarks")]
type DelegationSignatureVerification = AlwaysVerify<AccountId, Vec<u8>, Self::Signature>;
type DelegationSignatureVerification = kilt_support::signature::AlwaysVerify<AccountId, Vec<u8>, Self::Signature>;

type RuntimeEvent = RuntimeEvent;
type RuntimeHoldReason = RuntimeHoldReason;
Expand Down Expand Up @@ -1473,7 +1462,7 @@ impl_runtime_apis! {

#[cfg(feature = "try-runtime")]
impl frame_try_runtime::TryRuntime<Block> for Runtime {
fn on_runtime_upgrade(checks: UpgradeCheckSelect) -> (Weight, Weight) {
fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
log::info!("try-runtime::on_runtime_upgrade peregrine.");
let weight = Executive::try_runtime_upgrade(checks).unwrap();
(weight, BlockWeights::get().max_block)
Expand Down