From a1f002396a5ce260b4b84b8a88b5fb457fe93bd5 Mon Sep 17 00:00:00 2001 From: Gregory Sobol Date: Fri, 3 May 2024 13:09:07 +0200 Subject: [PATCH] chore(builtin): remove builtin dummy actors (#3940) --- pallets/gear-builtin/src/benchmarking.rs | 59 +----------------------- runtime/vara/src/lib.rs | 3 -- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/pallets/gear-builtin/src/benchmarking.rs b/pallets/gear-builtin/src/benchmarking.rs index 66005f7973b..ade92dfb767 100644 --- a/pallets/gear-builtin/src/benchmarking.rs +++ b/pallets/gear-builtin/src/benchmarking.rs @@ -27,69 +27,12 @@ use ark_ff::biginteger::BigInt; use ark_scale::hazmat::ArkScaleProjective; use ark_std::{ops::Mul, UniformRand}; use frame_benchmarking::{benchmarks, impl_benchmark_test_suite}; -use gear_core::message::{Payload, StoredDispatch, MAX_PAYLOAD_SIZE}; +use gear_core::message::MAX_PAYLOAD_SIZE; use parity_scale_codec::{Compact, Encode, Input}; type ArkScale = ark_scale::ArkScale; type ScalarField = ::ScalarField; -macro_rules! impl_builtin_actor { - ($name: ident, $id: literal) => { - pub struct $name(core::marker::PhantomData); - - impl BuiltinActor for $name { - type Error = BuiltinActorError; - - const ID: u64 = $id; - - fn handle( - _message: &StoredDispatch, - _gas_limit: u64, - ) -> (Result, u64) { - (Ok(Default::default()), Default::default()) - } - } - }; -} - -impl_builtin_actor!(DummyActor0, 0); -impl_builtin_actor!(DummyActor1, 1); -impl_builtin_actor!(DummyActor2, 2); -impl_builtin_actor!(DummyActor3, 3); -impl_builtin_actor!(DummyActor4, 4); -impl_builtin_actor!(DummyActor5, 5); -impl_builtin_actor!(DummyActor6, 6); -impl_builtin_actor!(DummyActor7, 7); -impl_builtin_actor!(DummyActor8, 8); -impl_builtin_actor!(DummyActor9, 9); -impl_builtin_actor!(DummyActor10, 10); -impl_builtin_actor!(DummyActor11, 11); -impl_builtin_actor!(DummyActor12, 12); -impl_builtin_actor!(DummyActor13, 13); -impl_builtin_actor!(DummyActor14, 14); -impl_builtin_actor!(DummyActor15, 15); - -// This type is plugged into the Runtime when the `runtime-benchmarks` feature is enabled. -#[allow(unused)] -pub type BenchmarkingBuiltinActor = ( - DummyActor0, - DummyActor1, - DummyActor2, - DummyActor3, - DummyActor4, - DummyActor5, - DummyActor6, - DummyActor7, - DummyActor8, - DummyActor9, - DummyActor10, - DummyActor11, - DummyActor12, - DummyActor13, - DummyActor14, - DummyActor15, -); - const MAX_BIG_INT: u32 = 100; fn naive_var_base_msm(bases: &[G::MulBase], scalars: &[G::ScalarField]) -> G { diff --git a/runtime/vara/src/lib.rs b/runtime/vara/src/lib.rs index f10f7d1bd53..72358ad7943 100644 --- a/runtime/vara/src/lib.rs +++ b/runtime/vara/src/lib.rs @@ -1066,10 +1066,7 @@ impl pallet_gear_messenger::Config for Runtime { } /// Builtin actors arranged in a tuple. -#[cfg(not(feature = "runtime-benchmarks"))] pub type BuiltinActors = (pallet_gear_builtin::bls12_381::Actor,); -#[cfg(feature = "runtime-benchmarks")] -pub type BuiltinActors = pallet_gear_builtin::benchmarking::BenchmarkingBuiltinActor; parameter_types! { pub const BuiltinActorPalletId: PalletId = PalletId(*b"py/biact");