`a848b6b044bc`

diff tree log

Fix/benchmakrs n try runtime

6 files changed

modifiedCargo.lockdiff before after both

68source = "registry+https://github.com/rust-lang/crates.io-index"68source = "registry+https://github.com/rust-lang/crates.io-index"
69checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"69checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
70dependencies = [70dependencies = [
71 "getrandom 0.2.7",71 "getrandom 0.2.8",
72 "once_cell",72 "once_cell",
73 "version_check",73 "version_check",
74]74]
108108
109[[package]]109[[package]]
110name = "anyhow"110name = "anyhow"
111version = "1.0.65"111version = "1.0.66"
112source = "registry+https://github.com/rust-lang/crates.io-index"112source = "registry+https://github.com/rust-lang/crates.io-index"
113checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"113checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
114114
115[[package]]115[[package]]
116name = "app-promotion-rpc"116name = "app-promotion-rpc"
392checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"392checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
393dependencies = [393dependencies = [
394 "futures-core",394 "futures-core",
395 "getrandom 0.2.7",395 "getrandom 0.2.8",
396 "instant",396 "instant",
397 "pin-project-lite 0.2.9",397 "pin-project-lite 0.2.9",
398 "rand 0.8.5",398 "rand 0.8.5",
434434
435[[package]]435[[package]]
436name = "base64"436name = "base64"
437version = "0.13.0"437version = "0.13.1"
438source = "registry+https://github.com/rust-lang/crates.io-index"438source = "registry+https://github.com/rust-lang/crates.io-index"
439checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"439checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
440440
441[[package]]441[[package]]
442name = "base64ct"442name = "base64ct"
2442[[package]]2442[[package]]
2443name = "fc-consensus"2443name = "fc-consensus"
2444version = "2.0.0-dev"2444version = "2.0.0-dev"
2445source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2445source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2446dependencies = [2446dependencies = [
2447 "async-trait",2447 "async-trait",
2448 "fc-db",2448 "fc-db",
2461[[package]]2461[[package]]
2462name = "fc-db"2462name = "fc-db"
2463version = "2.0.0-dev"2463version = "2.0.0-dev"
2464source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2464source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2465dependencies = [2465dependencies = [
2466 "fp-storage",2466 "fp-storage",
2467 "kvdb-rocksdb",2467 "kvdb-rocksdb",
2477[[package]]2477[[package]]
2478name = "fc-mapping-sync"2478name = "fc-mapping-sync"
2479version = "2.0.0-dev"2479version = "2.0.0-dev"
2480source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2480source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2481dependencies = [2481dependencies = [
2482 "fc-db",2482 "fc-db",
2483 "fp-consensus",2483 "fp-consensus",
2494[[package]]2494[[package]]
2495name = "fc-rpc"2495name = "fc-rpc"
2496version = "2.0.0-dev"2496version = "2.0.0-dev"
2497source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2497source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2498dependencies = [2498dependencies = [
2499 "ethereum",2499 "ethereum",
2500 "ethereum-types",2500 "ethereum-types",
2536[[package]]2536[[package]]
2537name = "fc-rpc-core"2537name = "fc-rpc-core"
2538version = "1.1.0-dev"2538version = "1.1.0-dev"
2539source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2539source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2540dependencies = [2540dependencies = [
2541 "ethereum",2541 "ethereum",
2542 "ethereum-types",2542 "ethereum-types",
2676[[package]]2676[[package]]
2677name = "fp-consensus"2677name = "fp-consensus"
2678version = "2.0.0-dev"2678version = "2.0.0-dev"
2679source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2679source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2680dependencies = [2680dependencies = [
2681 "ethereum",2681 "ethereum",
2682 "parity-scale-codec 3.2.1",2682 "parity-scale-codec 3.2.1",
2688[[package]]2688[[package]]
2689name = "fp-evm"2689name = "fp-evm"
2690version = "3.0.0-dev"2690version = "3.0.0-dev"
2691source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2691source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2692dependencies = [2692dependencies = [
2693 "evm",2693 "evm",
2694 "frame-support",2694 "frame-support",
2702[[package]]2702[[package]]
2703name = "fp-evm-mapping"2703name = "fp-evm-mapping"
2704version = "0.1.0"2704version = "0.1.0"
2705source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2705source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2706dependencies = [2706dependencies = [
2707 "frame-support",2707 "frame-support",
2708 "sp-core",2708 "sp-core",
2711[[package]]2711[[package]]
2712name = "fp-rpc"2712name = "fp-rpc"
2713version = "3.0.0-dev"2713version = "3.0.0-dev"
2714source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2714source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2715dependencies = [2715dependencies = [
2716 "ethereum",2716 "ethereum",
2717 "ethereum-types",2717 "ethereum-types",
2728[[package]]2728[[package]]
2729name = "fp-self-contained"2729name = "fp-self-contained"
2730version = "1.0.0-dev"2730version = "1.0.0-dev"
2731source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2731source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2732dependencies = [2732dependencies = [
2733 "ethereum",2733 "ethereum",
2734 "frame-support",2734 "frame-support",
2744[[package]]2744[[package]]
2745name = "fp-storage"2745name = "fp-storage"
2746version = "2.0.0"2746version = "2.0.0"
2747source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"2747source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
2748dependencies = [2748dependencies = [
2749 "parity-scale-codec 3.2.1",2749 "parity-scale-codec 3.2.1",
2750]2750]
32293229
3230[[package]]3230[[package]]
3231name = "getrandom"3231name = "getrandom"
3232version = "0.2.7"3232version = "0.2.8"
3233source = "registry+https://github.com/rust-lang/crates.io-index"3233source = "registry+https://github.com/rust-lang/crates.io-index"
3234checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"3234checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
3235dependencies = [3235dependencies = [
3236 "cfg-if 1.0.0",3236 "cfg-if 1.0.0",
3237 "libc",3237 "libc",
4099 "bytes",4099 "bytes",
4100 "futures 0.3.25",4100 "futures 0.3.25",
4101 "futures-timer",4101 "futures-timer",
4102 "getrandom 0.2.7",4102 "getrandom 0.2.8",
4103 "instant",4103 "instant",
4104 "lazy_static",4104 "lazy_static",
4105 "libp2p-autonat",4105 "libp2p-autonat",
5685[[package]]5685[[package]]
5686name = "pallet-base-fee"5686name = "pallet-base-fee"
5687version = "1.0.0"5687version = "1.0.0"
5688source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"5688source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
5689dependencies = [5689dependencies = [
5690 "fp-evm",5690 "fp-evm",
5691 "frame-support",5691 "frame-support",
5901[[package]]5901[[package]]
5902name = "pallet-ethereum"5902name = "pallet-ethereum"
5903version = "4.0.0-dev"5903version = "4.0.0-dev"
5904source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"5904source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
5905dependencies = [5905dependencies = [
5906 "ethereum",5906 "ethereum",
5907 "ethereum-types",5907 "ethereum-types",
5930[[package]]5930[[package]]
5931name = "pallet-evm"5931name = "pallet-evm"
5932version = "6.0.0-dev"5932version = "6.0.0-dev"
5933source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#0ba6acff2003ee4798050120d006242949968dac"5933source = "git+https://github.com/uniquenetwork/frontier?branch=unique-polkadot-v0.9.30#65930cb2982258bee67b73a1f017711f6f4aa0a4"
5934dependencies = [5934dependencies = [
5935 "evm",5935 "evm",
5936 "fp-evm",5936 "fp-evm",
85728572
8573[[package]]8573[[package]]
8574name = "prometheus"8574name = "prometheus"
8575version = "0.13.2"8575version = "0.13.3"
8576source = "registry+https://github.com/rust-lang/crates.io-index"8576source = "registry+https://github.com/rust-lang/crates.io-index"
8577checksum = "45c8babc29389186697fe5a2a4859d697825496b83db5d0b65271cdc0488e88c"8577checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
8578dependencies = [8578dependencies = [
8579 "cfg-if 1.0.0",8579 "cfg-if 1.0.0",
8580 "fnv",8580 "fnv",
8928source = "registry+https://github.com/rust-lang/crates.io-index"8928source = "registry+https://github.com/rust-lang/crates.io-index"
8929checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"8929checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
8930dependencies = [8930dependencies = [
8931 "getrandom 0.2.7",8931 "getrandom 0.2.8",
8932]8932]
89338933
8934[[package]]8934[[package]]
9013source = "registry+https://github.com/rust-lang/crates.io-index"9013source = "registry+https://github.com/rust-lang/crates.io-index"
9014checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"9014checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
9015dependencies = [9015dependencies = [
9016 "getrandom 0.2.7",9016 "getrandom 0.2.8",
9017 "redox_syscall",9017 "redox_syscall",
9018 "thiserror",9018 "thiserror",
9019]9019]
91539153
9154[[package]]9154[[package]]
9155name = "rlp"9155name = "rlp"
9156version = "0.5.1"9156version = "0.5.2"
9157source = "registry+https://github.com/rust-lang/crates.io-index"9157source = "registry+https://github.com/rust-lang/crates.io-index"
9158checksum = "999508abb0ae792aabed2460c45b89106d97fe4adac593bdaef433c2605847b5"9158checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
9159dependencies = [9159dependencies = [
9160 "bytes",9160 "bytes",
9161 "rustc-hex",9161 "rustc-hex",
1072110721
10722[[package]]10722[[package]]
10723name = "serde"10723name = "serde"
10724version = "1.0.145"10724version = "1.0.146"
10725source = "registry+https://github.com/rust-lang/crates.io-index"10725source = "registry+https://github.com/rust-lang/crates.io-index"
10726checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"10726checksum = "6df50b7a60a0ad48e1b42eb38373eac8ff785d619fb14db917b4e63d5439361f"
10727dependencies = [10727dependencies = [
10728 "serde_derive",10728 "serde_derive",
10729]10729]
1073010730
10731[[package]]10731[[package]]
10732name = "serde_derive"10732name = "serde_derive"
10733version = "1.0.145"10733version = "1.0.146"
10734source = "registry+https://github.com/rust-lang/crates.io-index"10734source = "registry+https://github.com/rust-lang/crates.io-index"
10735checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"10735checksum = "a714fd32ba1d66047ce7d53dabd809e9922d538f9047de13cc4cffca47b36205"
10736dependencies = [10736dependencies = [
10737 "proc-macro2",10737 "proc-macro2",
10738 "quote",10738 "quote",
1200212002
12003[[package]]12003[[package]]
12004name = "syn"12004name = "syn"
12005version = "1.0.102"12005version = "1.0.103"
12006source = "registry+https://github.com/rust-lang/crates.io-index"12006source = "registry+https://github.com/rust-lang/crates.io-index"
12007checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"12007checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
12008dependencies = [12008dependencies = [
12009 "proc-macro2",12009 "proc-macro2",
12010 "quote",12010 "quote",

modifiedpallets/fungible/src/benchmarking.rsdiff before after both

--- a/pallets/fungible/src/benchmarking.rs
+++ b/pallets/fungible/src/benchmarking.rs
@@ -31,7 +31,9 @@
 	create_collection_raw(
 		owner,
 		CollectionMode::Fungible(0),
-		|owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),
+		|owner: T::CrossAccountId, data| {
+			<Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())
+		},
 		FungibleHandle::cast,
 	)
 }

modifiedpallets/refungible/src/benchmarking.rsdiff before after both

--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -62,7 +62,9 @@
 	create_collection_raw(
 		owner,
 		CollectionMode::ReFungible,
-		|owner: T::CrossAccountId, data| <Pallet<T>>::init_collection(owner.clone(), owner, data),
+		|owner: T::CrossAccountId, data| {
+			<Pallet<T>>::init_collection(owner.clone(), owner, data, Default::default())
+		},
 		RefungibleHandle::cast,
 	)
 }

modifiedpallets/scheduler/src/benchmarking.rsdiff before after both

--- a/pallets/scheduler/src/benchmarking.rs
+++ b/pallets/scheduler/src/benchmarking.rs
@@ -93,9 +93,9 @@
 	Ok(())
 }
 
-fn call_and_hash<T: Config>(i: u32) -> (<T as Config>::Call, T::Hash) {
+fn call_and_hash<T: Config>(i: u32) -> (<T as Config>::RuntimeCall, T::Hash) {
 	// Essentially a no-op call.
-	let call: <T as Config>::Call = frame_system::Call::remark { remark: i.encode() }.into();
+	let call: <T as Config>::RuntimeCall = frame_system::Call::remark { remark: i.encode() }.into();
 	let hash = T::Hashing::hash_of(&call);
 	(call, hash)
 }

modifiedpallets/structure/src/benchmarking.rsdiff before after both

--- a/pallets/structure/src/benchmarking.rs
+++ b/pallets/structure/src/benchmarking.rs
@@ -19,7 +19,8 @@
 use frame_benchmarking::{benchmarks, account};
 use frame_support::traits::{Currency, Get};
 use up_data_structs::{
-	CreateCollectionData, CollectionMode, CreateItemData, CreateNftData, budget::Unlimited,
+	CreateCollectionData, CollectionMode, CreateItemData, CollectionFlags, CreateNftData,
+	budget::Unlimited,
 };
 use pallet_common::Config as CommonConfig;
 use pallet_evm::account::CrossAccountId;
@@ -32,10 +33,15 @@
 		let caller_cross = T::CrossAccountId::from_sub(caller.clone());
 
 		<T as CommonConfig>::Currency::deposit_creating(&caller, T::CollectionCreationPrice::get());
-		T::CollectionDispatch::create(caller_cross.clone(), caller_cross.clone(), CreateCollectionData {
-			mode: CollectionMode::NFT,
-			..Default::default()
-		})?;
+		T::CollectionDispatch::create(
+			caller_cross.clone(),
+			caller_cross.clone(),
+			CreateCollectionData {
+				mode: CollectionMode::NFT,
+				..Default::default()
+			},
+			CollectionFlags::default(),
+		)?;
 		let dispatch = T::CollectionDispatch::dispatch(CollectionHandle::try_get(CollectionId(1))?);
 		let dispatch = dispatch.as_dyn();

modifiedruntime/common/runtime_apis.rsdiff before after both

--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -683,8 +683,8 @@
                     #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
                     list_benchmark!(list, extra, pallet_refungible, Refungible);
 
-                    #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
-                    list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);
+                    // #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
+                    // list_benchmark!(list, extra, pallet_unique_scheduler, Scheduler);
 
                     #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
                     list_benchmark!(list, extra, pallet_proxy_rmrk_core, RmrkCore);
@@ -743,8 +743,8 @@
                     #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
                     add_benchmark!(params, batches, pallet_refungible, Refungible);
 
-                    #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
-                    add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);
+                    // #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
+                    // add_benchmark!(params, batches, pallet_unique_scheduler, Scheduler);
 
                     #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]
                     add_benchmark!(params, batches, pallet_proxy_rmrk_core, RmrkCore);