git.delta.rocks / unique-network / refs/commits / 0a85bcfdec34

--- a/pallets/app-promotion/Cargo.toml
+++ b/pallets/app-promotion/Cargo.toml
@@ -66,8 +66,6 @@
 pallet-common ={ default-features = false, path = "../common" }
 pallet-unique ={ default-features = false, path = "../unique" }
 pallet-evm-contract-helpers ={ default-features = false, path = "../evm-contract-helpers" }
-
-[dev-dependencies]
 pallet-evm-migration ={ default-features = false, path = "../evm-migration" }
 
 ################################################################################

--- a/pallets/app-promotion/src/benchmarking.rs
+++ b/pallets/app-promotion/src/benchmarking.rs
@@ -20,11 +20,10 @@
 use crate::Pallet as PromototionPallet;
 
 use sp_runtime::traits::Bounded;
-use sp_std::vec;
 
 use frame_benchmarking::{benchmarks, account};
 use frame_support::traits::OnInitialize;
-use frame_system::{Origin, RawOrigin};
+use frame_system::RawOrigin;
 use pallet_unique::benchmarking::create_nft_collection;
 use pallet_evm_migration::Pallet as EvmMigrationPallet;
 

--- a/pallets/common/src/benchmarking.rs
+++ b/pallets/common/src/benchmarking.rs
@@ -19,8 +19,8 @@
 use pallet_evm::account::CrossAccountId;
 use frame_benchmarking::{benchmarks, account};
 use up_data_structs::{
-	CollectionMode, CreateCollectionData, CollectionId, Property, PropertyKey, PropertyValue,
-	CollectionPermissions, NestingPermissions, MAX_COLLECTION_NAME_LENGTH,
+	CollectionMode, CollectionFlags, CreateCollectionData, CollectionId, Property, PropertyKey,
+	PropertyValue, CollectionPermissions, NestingPermissions, MAX_COLLECTION_NAME_LENGTH,
 	MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_TOKEN_PREFIX_LENGTH, MAX_PROPERTIES_PER_ITEM,
 };
 use frame_support::{
@@ -116,7 +116,7 @@
 	create_collection_raw(
 		owner,
 		CollectionMode::NFT,
-		|owner, data| <Pallet<T>>::init_collection(owner, data, true),
+		|owner, data| <Pallet<T>>::init_collection(owner, data, CollectionFlags::default()),
 		|h| h,
 	)
 }

--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -346,7 +346,7 @@
 	use frame_support::{Blake2_128Concat, pallet_prelude::*, storage::Key, traits::StorageVersion};
 	use frame_system::pallet_prelude::*;
 	use frame_support::traits::Currency;
-	use up_data_structs::{TokenId, mapping::TokenAddressMapping, CollectionFlags};
+	use up_data_structs::{TokenId, mapping::TokenAddressMapping};
 	use scale_info::TypeInfo;
 	use weights::WeightInfo;
 

--- a/pallets/foreign-assets/src/benchmarking.rs
+++ b/pallets/foreign-assets/src/benchmarking.rs
@@ -16,11 +16,10 @@
 
 #![allow(missing_docs)]
 
-use super::{Config, Pallet};
+use super::{Config, Pallet, Call};
 use frame_benchmarking::{benchmarks, account};
 use frame_system::RawOrigin;
 use crate::AssetMetadata;
-use crate::Pallet as ForeignAssets;
 use xcm::opaque::latest::Junction::Parachain;
 use xcm::VersionedMultiLocation;
 use frame_support::{
@@ -30,7 +29,6 @@
 
 benchmarks! {
 	register_foreign_asset {
-		let origin: RawOrigin<T::AccountId> = frame_system::RawOrigin::Root;
 		let owner: T::AccountId = account("user", 0, 1);
 		let location: VersionedMultiLocation = VersionedMultiLocation::from(Parachain(1000).into());
 		let metadata: AssetMetadata<<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance> = AssetMetadata{
@@ -44,12 +42,9 @@
 		balance = balance * balance;
 		<T as Config>::Currency::make_free_balance_be(&owner,
 			balance);
-	}: {
-		ForeignAssets::<T>::register_foreign_asset(origin.into(), owner, Box::new(location), Box::new(metadata))?
-	}
+	}: _(RawOrigin::Root, owner, Box::new(location), Box::new(metadata))
 
 	update_foreign_asset {
-		let origin: RawOrigin<T::AccountId> = frame_system::RawOrigin::Root;
 		let owner: T::AccountId = account("user", 0, 1);
 		let location: VersionedMultiLocation = VersionedMultiLocation::from(Parachain(2000).into());
 		let metadata: AssetMetadata<<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance> = AssetMetadata{
@@ -68,9 +63,6 @@
 		   4_000_000_000u32.into();
 		balance = balance * balance;
 		<T as Config>::Currency::make_free_balance_be(&owner, balance);
-		ForeignAssets::<T>::register_foreign_asset(origin.clone().into(), owner, Box::new(location.clone()), Box::new(metadata))?;
-
-	}: {
-		ForeignAssets::<T>::update_foreign_asset(origin.into(), 0, Box::new(location), Box::new(metadata2))?
-	}
+		Pallet::<T>::register_foreign_asset(RawOrigin::Root.into(), owner, Box::new(location.clone()), Box::new(metadata))?;
+	}: _(RawOrigin::Root, 0, Box::new(location), Box::new(metadata2))
 }

11// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs
2
3//! Autogenerated weights for pallet_foreign_assets
4//!
5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
6//! DATE: 2022-09-16, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
8
9// Executed Command:
10// target/release/unique-collator
11// benchmark
12// pallet
13// --pallet
14// pallet-foreign-assets
15// --wasm-execution
16// compiled
17// --extrinsic
18// *
19// --template
20// .maintain/frame-weight-template.hbs
21// --steps=50
22// --repeat=80
23// --heap-pages=4096
24// --output=./pallets/foreign-assets/src/weights.rs
25
2#![cfg_attr(rustfmt, rustfmt_skip)]26#![cfg_attr(rustfmt, rustfmt_skip)]
3#![allow(unused_parens)]27#![allow(unused_parens)]
4#![allow(unused_imports)]28#![allow(unused_imports)]
29#![allow(missing_docs)]
5#![allow(clippy::unnecessary_cast)]30#![allow(clippy::unnecessary_cast)]
631
7use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};32use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
8use sp_std::marker::PhantomData;33use sp_std::marker::PhantomData;
934
10/// Weight functions needed for module_asset_registry.35/// Weight functions needed for pallet_foreign_assets.
11pub trait WeightInfo {36pub trait WeightInfo {
12	fn register_foreign_asset() -> Weight;37	fn register_foreign_asset() -> Weight;
13	fn update_foreign_asset() -> Weight;38	fn update_foreign_asset() -> Weight;
14}39}
1540
16/// Weights for pallet_fungible using the Substrate node and recommended hardware.41/// Weights for pallet_foreign_assets using the Substrate node and recommended hardware.
17pub struct SubstrateWeight<T>(PhantomData<T>);42pub struct SubstrateWeight<T>(PhantomData<T>);
18impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {43impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
44	// Storage: Common CreatedCollectionCount (r:1 w:1)
45	// Storage: Common DestroyedCollectionCount (r:1 w:0)
46	// Storage: System Account (r:2 w:2)
47	// Storage: ForeignAssets NextForeignAssetId (r:1 w:1)
48	// Storage: ForeignAssets LocationToCurrencyIds (r:1 w:1)
49	// Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
50	// Storage: ForeignAssets AssetMetadatas (r:1 w:1)
51	// Storage: ForeignAssets AssetBinding (r:1 w:1)
52	// Storage: Common CollectionPropertyPermissions (r:0 w:1)
53	// Storage: Common CollectionProperties (r:0 w:1)
54	// Storage: Common CollectionById (r:0 w:1)
19	fn register_foreign_asset() -> Weight {55	fn register_foreign_asset() -> Weight {
20		(29_819_000 as Weight)56		(52_161_000 as Weight)
21			.saturating_add(T::DbWeight::get().reads(2 as Weight))57			.saturating_add(T::DbWeight::get().reads(9 as Weight))
22			.saturating_add(T::DbWeight::get().writes(3 as Weight))58			.saturating_add(T::DbWeight::get().writes(11 as Weight))
23	}59	}
60	// Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
61	// Storage: ForeignAssets AssetMetadatas (r:1 w:1)
24	fn update_foreign_asset() -> Weight {62	fn update_foreign_asset() -> Weight {
25		(25_119_000 as Weight)63		(19_111_000 as Weight)
26			.saturating_add(T::DbWeight::get().reads(1 as Weight))64			.saturating_add(T::DbWeight::get().reads(2 as Weight))
27			.saturating_add(T::DbWeight::get().writes(1 as Weight))65			.saturating_add(T::DbWeight::get().writes(2 as Weight))
28	}66	}
29}67}
3068
31// For backwards compatibility and tests69// For backwards compatibility and tests
32impl WeightInfo for () {70impl WeightInfo for () {
71	// Storage: Common CreatedCollectionCount (r:1 w:1)
72	// Storage: Common DestroyedCollectionCount (r:1 w:0)
73	// Storage: System Account (r:2 w:2)
74	// Storage: ForeignAssets NextForeignAssetId (r:1 w:1)
75	// Storage: ForeignAssets LocationToCurrencyIds (r:1 w:1)
76	// Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
77	// Storage: ForeignAssets AssetMetadatas (r:1 w:1)
78	// Storage: ForeignAssets AssetBinding (r:1 w:1)
79	// Storage: Common CollectionPropertyPermissions (r:0 w:1)
80	// Storage: Common CollectionProperties (r:0 w:1)
81	// Storage: Common CollectionById (r:0 w:1)
33	fn register_foreign_asset() -> Weight {82	fn register_foreign_asset() -> Weight {
34		(29_819_000 as Weight)83		(52_161_000 as Weight)
35			.saturating_add(RocksDbWeight::get().reads(2 as Weight))84			.saturating_add(RocksDbWeight::get().reads(9 as Weight))
36			.saturating_add(RocksDbWeight::get().writes(3 as Weight))85			.saturating_add(RocksDbWeight::get().writes(11 as Weight))
37	}86	}
87	// Storage: ForeignAssets ForeignAssetLocations (r:1 w:1)
88	// Storage: ForeignAssets AssetMetadatas (r:1 w:1)
38	fn update_foreign_asset() -> Weight {89	fn update_foreign_asset() -> Weight {
39		(25_119_000 as Weight)90		(19_111_000 as Weight)
40			.saturating_add(RocksDbWeight::get().reads(1 as Weight))91			.saturating_add(RocksDbWeight::get().reads(2 as Weight))
41			.saturating_add(RocksDbWeight::get().writes(1 as Weight))92			.saturating_add(RocksDbWeight::get().writes(2 as Weight))
42	}93	}
43}94}
95