Skip to content

Commit 89d44a8

Browse files
KiChjangmichalkucharczykbkchr
authored
Companion for paritytech/substrate#12219 (#1610)
* Remove CanAuthorWith trait CanAuthotWith trait removed. Also all dependencies, parameters, type paramers were removed. This is related to removal of native runtime. * Companion for paritytech/substrate#12219 * Fixes * polkadot-runtime-common updated cargo update -p polkadot-runtime-common * warning fixed * Update cid * update lockfile for {"polkadot", "substrate"} * Update substrate * update lockfile for {"polkadot", "substrate"} * Update polkadot * Fix tests * 🤦 Co-authored-by: Michal Kucharczyk <[email protected]> Co-authored-by: parity-processbot <> Co-authored-by: Bastian Köcher <[email protected]>
1 parent 20a5475 commit 89d44a8

File tree

11 files changed

+46
-24
lines changed

11 files changed

+46
-24
lines changed

cumulus/parachain-template/runtime/src/lib.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ use sp_version::NativeVersion;
2626
use sp_version::RuntimeVersion;
2727

2828
use frame_support::{
29-
construct_runtime, parameter_types,
29+
construct_runtime,
30+
dispatch::DispatchClass,
31+
parameter_types,
3032
traits::Everything,
3133
weights::{
32-
constants::WEIGHT_PER_SECOND, ConstantMultiplier, DispatchClass, Weight,
33-
WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
34+
constants::WEIGHT_PER_SECOND, ConstantMultiplier, Weight, WeightToFeeCoefficient,
35+
WeightToFeeCoefficients, WeightToFeePolynomial,
3436
},
3537
PalletId,
3638
};

cumulus/parachains/runtimes/assets/statemine/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ use sp_version::RuntimeVersion;
4646
use codec::{Decode, Encode, MaxEncodedLen};
4747
use constants::{currency::*, fee::WeightToFee};
4848
use frame_support::{
49-
construct_runtime, parameter_types,
49+
construct_runtime,
50+
dispatch::DispatchClass,
51+
parameter_types,
5052
traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter},
51-
weights::{ConstantMultiplier, DispatchClass, Weight},
53+
weights::{ConstantMultiplier, Weight},
5254
PalletId, RuntimeDebug,
5355
};
5456
use frame_system::{

cumulus/parachains/runtimes/assets/statemint/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ use sp_version::RuntimeVersion;
7575
use codec::{Decode, Encode, MaxEncodedLen};
7676
use constants::{currency::*, fee::WeightToFee};
7777
use frame_support::{
78-
construct_runtime, parameter_types,
78+
construct_runtime,
79+
dispatch::DispatchClass,
80+
parameter_types,
7981
traits::{AsEnsureOriginWithArg, EitherOfDiverse, InstanceFilter},
80-
weights::{ConstantMultiplier, DispatchClass, Weight},
82+
weights::{ConstantMultiplier, Weight},
8183
PalletId, RuntimeDebug,
8284
};
8385
use frame_system::{

cumulus/parachains/runtimes/assets/westmint/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ use sp_version::RuntimeVersion;
4646
use codec::{Decode, Encode, MaxEncodedLen};
4747
use constants::{currency::*, fee::WeightToFee};
4848
use frame_support::{
49-
construct_runtime, parameter_types,
49+
construct_runtime,
50+
dispatch::DispatchClass,
51+
parameter_types,
5052
traits::{AsEnsureOriginWithArg, InstanceFilter},
51-
weights::{ConstantMultiplier, DispatchClass, Weight},
53+
weights::{ConstantMultiplier, Weight},
5254
PalletId, RuntimeDebug,
5355
};
5456
use frame_system::{

cumulus/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ use sp_version::RuntimeVersion;
6161
use codec::{Decode, Encode, MaxEncodedLen};
6262
use constants::{currency::*, fee::WeightToFee};
6363
use frame_support::{
64-
construct_runtime, parameter_types,
64+
construct_runtime,
65+
dispatch::DispatchClass,
66+
parameter_types,
6567
traits::{ConstU16, ConstU32, ConstU64, ConstU8, EitherOfDiverse, InstanceFilter},
66-
weights::{ConstantMultiplier, DispatchClass, Weight},
68+
weights::{ConstantMultiplier, Weight},
6769
PalletId, RuntimeDebug,
6870
};
6971
use frame_system::{

cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ use sp_version::RuntimeVersion;
4747

4848
use constants::{currency::*, fee::WeightToFee};
4949
use frame_support::{
50-
construct_runtime, parameter_types,
50+
construct_runtime,
51+
dispatch::DispatchClass,
52+
parameter_types,
5153
traits::{ConstU128, ConstU16, ConstU32, ConstU64, ConstU8, Everything},
52-
weights::{ConstantMultiplier, DispatchClass, Weight},
54+
weights::{ConstantMultiplier, Weight},
5355
PalletId,
5456
};
5557
use frame_system::limits::{BlockLength, BlockWeights};

cumulus/parachains/runtimes/starters/seedling/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,13 @@ use sp_version::RuntimeVersion;
4343

4444
// A few exports that help ease life for downstream crates.
4545
pub use frame_support::{
46-
construct_runtime, parameter_types,
46+
construct_runtime,
47+
dispatch::DispatchClass,
48+
parameter_types,
4749
traits::{IsInVec, Randomness},
4850
weights::{
4951
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
50-
DispatchClass, IdentityFee, Weight,
52+
IdentityFee, Weight,
5153
},
5254
StorageValue,
5355
};

cumulus/parachains/runtimes/starters/shell/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,13 @@ use sp_version::RuntimeVersion;
5050

5151
// A few exports that help ease life for downstream crates.
5252
pub use frame_support::{
53-
construct_runtime, parameter_types,
53+
construct_runtime,
54+
dispatch::DispatchClass,
55+
parameter_types,
5456
traits::{Everything, IsInVec, Randomness},
5557
weights::{
5658
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
57-
DispatchClass, IdentityFee, Weight,
59+
IdentityFee, Weight,
5860
},
5961
StorageValue,
6062
};

cumulus/parachains/runtimes/testing/penpal/src/lib.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ pub mod xcm_config;
3232

3333
use cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
3434
use frame_support::{
35-
construct_runtime, parameter_types,
35+
construct_runtime,
36+
dispatch::DispatchClass,
37+
parameter_types,
3638
traits::Everything,
3739
weights::{
38-
constants::WEIGHT_PER_SECOND, ConstantMultiplier, DispatchClass, Weight,
39-
WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
40+
constants::WEIGHT_PER_SECOND, ConstantMultiplier, Weight, WeightToFeeCoefficient,
41+
WeightToFeeCoefficients, WeightToFeePolynomial,
4042
},
4143
PalletId,
4244
};

cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ use sp_version::RuntimeVersion;
3838

3939
// A few exports that help ease life for downstream crates.
4040
pub use frame_support::{
41-
construct_runtime, match_types, parameter_types,
41+
construct_runtime,
42+
dispatch::DispatchClass,
43+
match_types, parameter_types,
4244
traits::{EitherOfDiverse, Everything, IsInVec, Randomness},
4345
weights::{
4446
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
45-
ConstantMultiplier, DispatchClass, IdentityFee, Weight,
47+
ConstantMultiplier, IdentityFee, Weight,
4648
},
4749
StorageValue,
4850
};

cumulus/test/runtime/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@ use sp_version::RuntimeVersion;
4545

4646
// A few exports that help ease life for downstream crates.
4747
pub use frame_support::{
48-
construct_runtime, parameter_types,
48+
construct_runtime,
49+
dispatch::DispatchClass,
50+
parameter_types,
4951
traits::Randomness,
5052
weights::{
5153
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
52-
ConstantMultiplier, DispatchClass, IdentityFee, Weight,
54+
ConstantMultiplier, IdentityFee, Weight,
5355
},
5456
StorageValue,
5557
};

0 commit comments

Comments
 (0)