pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-15 10:21:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Companion for #10896: Minor Uniques pallet improvements (#1070)"

Browse Source 
This reverts commit 1919cbb4d4.
This commit is contained in:
Bastian Köcher
2022-03-21 23:19:21 +01:00
parent fc903ed678
commit 5d6e38fc11
16 changed files with 385 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+343 -345
View File
File diff suppressed because it is too large Load Diff
parachain-template/runtime/src/xcm_config.rs
+2 -2
View File
@@ -3,7 +3,7 @@ use super::{
WeightToFee, XcmpQueue,
};
use frame_support::{
match_types, parameter_types,
match_type, parameter_types,
traits::{Everything, Nothing},
weights::Weight,
};
@@ -80,7 +80,7 @@ parameter_types! {
pub const MaxInstructions: u32 = 100;
}
match_types! {
match_type! {
pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
polkadot-parachains/canvas-kusama/src/xcm_config.rs
+4 -2
View File
@@ -18,7 +18,7 @@ use super::{
WeightToFee, XcmpQueue,
};
use frame_support::{
match_types, parameter_types,
match_type, parameter_types,
traits::{EnsureOneOf, Everything, Nothing},
weights::Weight,
};
@@ -106,11 +106,13 @@ parameter_types! {
pub const MaxInstructions: u32 = 100;
}
match_types! {
match_type! {
pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
};
}
match_type! {
pub type ParentOrSiblings: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(_) }
polkadot-parachains/rococo-parachain/src/lib.rs
+4 -2
View File
@@ -37,7 +37,7 @@ use sp_version::RuntimeVersion;
// A few exports that help ease life for downstream crates.
pub use frame_support::{
construct_runtime, match_types, parameter_types,
construct_runtime, match_type, parameter_types,
traits::{EnsureOneOf, Everything, IsInVec, Randomness},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
@@ -361,11 +361,13 @@ parameter_types! {
pub const MaxInstructions: u32 = 100;
}
match_types! {
match_type! {
pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }
};
}
match_type! {
pub type Statemint: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: X1(Parachain(1000)) }
};
polkadot-parachains/seedling/src/lib.rs
+1 -1
View File
@@ -37,7 +37,7 @@ use sp_version::RuntimeVersion;
// A few exports that help ease life for downstream crates.
pub use frame_support::{
construct_runtime, parameter_types,
construct_runtime, match_type, parameter_types,
traits::{IsInVec, Randomness},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
polkadot-parachains/shell/src/lib.rs
+1 -1
View File
@@ -42,7 +42,7 @@ use sp_version::RuntimeVersion;
// A few exports that help ease life for downstream crates.
pub use frame_support::{
construct_runtime, parameter_types,
construct_runtime, match_type, parameter_types,
traits::{Everything, IsInVec, Randomness},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
polkadot-parachains/shell/src/xcm_config.rs
+2 -2
View File
@@ -14,7 +14,7 @@
// limitations under the License.
use super::{AccountId, Call, Event, Origin, ParachainInfo, Runtime};
use frame_support::{match_types, parameter_types, weights::Weight};
use frame_support::{match_type, parameter_types, weights::Weight};
use xcm::latest::prelude::*;
use xcm_builder::{
AllowUnpaidExecutionFrom, FixedWeightBounds, LocationInverter, ParentAsSuperuser,
@@ -40,7 +40,7 @@ pub type XcmOriginToTransactDispatchOrigin = (
ParentAsSuperuser<Origin>,
);
match_types! {
match_type! {
pub type JustTheParent: impl Contains<MultiLocation> = { MultiLocation { parents:1, interior: Here } };
}
polkadot-parachains/statemine/src/lib.rs
+6 -6
View File
@@ -44,13 +44,16 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime, parameter_types,
traits::{AsEnsureOriginWithArg, EnsureOneOf, InstanceFilter},
weights::{DispatchClass, Weight},
traits::{EnsureOneOf, InstanceFilter},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
DispatchClass, Weight,
},
PalletId, RuntimeDebug,
};
use frame_system::{
limits::{BlockLength, BlockWeights},
EnsureRoot, EnsureSigned,
EnsureRoot,
};
pub use parachains_common as common;
use parachains_common::{
@@ -525,9 +528,6 @@ impl pallet_uniques::Config for Runtime {
type KeyLimit = KeyLimit;
type ValueLimit = ValueLimit;
type WeightInfo = weights::pallet_uniques::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")]
type Helper = ();
type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
}
// Create the runtime by composing the FRAME pallets that were previously configured.
polkadot-parachains/statemine/src/weights/pallet_uniques.rs
-7
View File
@@ -220,11 +220,4 @@ impl<T: frame_system::Config> pallet_uniques::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Uniques Class (r:1 w:0)
// Storage: Uniques Asset (r:1 w:1)
fn set_accept_ownership() -> Weight {
(19_417_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
}
polkadot-parachains/statemine/src/xcm_config.rs
+4 -2
View File
@@ -18,7 +18,7 @@ use super::{
ParachainSystem, PolkadotXcm, Runtime, WeightToFee, XcmpQueue,
};
use frame_support::{
match_types, parameter_types,
match_type, parameter_types,
traits::{Everything, Nothing, PalletInfoAccess},
weights::Weight,
};
@@ -128,11 +128,13 @@ parameter_types! {
pub const MaxInstructions: u32 = 100;
}
match_types! {
match_type! {
pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
};
}
match_type! {
pub type ParentOrSiblings: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(_) }
polkadot-parachains/statemint/src/lib.rs
+6 -6
View File
@@ -44,13 +44,16 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime, parameter_types,
traits::{AsEnsureOriginWithArg, Contains, EnsureOneOf, InstanceFilter},
weights::{DispatchClass, Weight},
traits::{Contains, EnsureOneOf, InstanceFilter},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
DispatchClass, Weight,
},
PalletId, RuntimeDebug,
};
use frame_system::{
limits::{BlockLength, BlockWeights},
EnsureRoot, EnsureSigned,
EnsureRoot,
};
pub use parachains_common as common;
use parachains_common::{
@@ -538,9 +541,6 @@ impl pallet_uniques::Config for Runtime {
type KeyLimit = KeyLimit;
type ValueLimit = ValueLimit;
type WeightInfo = weights::pallet_uniques::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")]
type Helper = ();
type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
}
// Create the runtime by composing the FRAME pallets that were previously configured.
polkadot-parachains/statemint/src/weights/pallet_uniques.rs
-7
View File
@@ -220,11 +220,4 @@ impl<T: frame_system::Config> pallet_uniques::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Uniques Class (r:1 w:0)
// Storage: Uniques Asset (r:1 w:1)
fn set_accept_ownership() -> Weight {
(19_417_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
}
polkadot-parachains/statemint/src/xcm_config.rs
+4 -2
View File
@@ -18,7 +18,7 @@ use super::{
ParachainSystem, PolkadotXcm, Runtime, WeightToFee, XcmpQueue,
};
use frame_support::{
match_types, parameter_types,
match_type, parameter_types,
traits::{Everything, Nothing, PalletInfoAccess},
weights::Weight,
};
@@ -128,11 +128,13 @@ parameter_types! {
pub const MaxInstructions: u32 = 100;
}
match_types! {
match_type! {
pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
};
}
match_type! {
pub type ParentOrSiblings: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(_) }
polkadot-parachains/westmint/src/lib.rs
+6 -6
View File
@@ -44,13 +44,16 @@ use codec::{Decode, Encode, MaxEncodedLen};
use constants::{currency::*, fee::WeightToFee};
use frame_support::{
construct_runtime, parameter_types,
traits::{AsEnsureOriginWithArg, InstanceFilter},
weights::{DispatchClass, Weight},
traits::InstanceFilter,
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight},
DispatchClass, Weight,
},
PalletId, RuntimeDebug,
};
use frame_system::{
limits::{BlockLength, BlockWeights},
EnsureRoot, EnsureSigned,
EnsureRoot,
};
pub use parachains_common as common;
use parachains_common::{
@@ -517,9 +520,6 @@ impl pallet_uniques::Config for Runtime {
type KeyLimit = KeyLimit;
type ValueLimit = ValueLimit;
type WeightInfo = weights::pallet_uniques::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")]
type Helper = ();
type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
}
// Create the runtime by composing the FRAME pallets that were previously configured.
polkadot-parachains/westmint/src/weights/pallet_uniques.rs
-7
View File
@@ -220,11 +220,4 @@ impl<T: frame_system::Config> pallet_uniques::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Uniques Class (r:1 w:0)
// Storage: Uniques Asset (r:1 w:1)
fn set_accept_ownership() -> Weight {
(19_417_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
}
polkadot-parachains/westmint/src/xcm_config.rs
+2 -2
View File
@@ -18,7 +18,7 @@ use super::{
ParachainSystem, PolkadotXcm, Runtime, WeightToFee, XcmpQueue,
};
use frame_support::{
match_types, parameter_types,
match_type, parameter_types,
traits::{Everything, PalletInfoAccess},
weights::Weight,
};
@@ -128,7 +128,7 @@ parameter_types! {
pub const MaxInstructions: u32 = 100;
}
match_types! {
match_type! {
pub type ParentOrParentsPlurality: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: Here } |
MultiLocation { parents: 1, interior: X1(Plurality { .. }) }