.

zrml/futarchy/src/benchmarking.rs

@@ -17,15 +17,14 @@
 
 #![cfg(feature = "runtime-benchmarks")]
 
-use crate::{types::Proposal, Call, Config, Event, Pallet, Proposals};
+use crate::{types::Proposal, Call, Config, Event, Pallet};
 use alloc::vec;
 use frame_benchmarking::v2::*;
 use frame_support::{
-    assert_ok,
     dispatch::RawOrigin,
     traits::{Bounded, Get},
 };
-use frame_system::{pallet_prelude::BlockNumberFor, Pallet as System};
+use frame_system::Pallet as System;
 use zeitgeist_primitives::traits::FutarchyBenchmarkHelper;
 
 #[benchmarks]

zrml/futarchy/src/weights.rs

@@ -0,0 +1,83 @@
+// Copyright 2022-2024 Forecasting Technologies LTD.
+// Copyright 2021-2022 Zeitgeist PM LLC.
+//
+// This file is part of Zeitgeist.
+//
+// Zeitgeist is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the
+// Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// Zeitgeist is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for zrml_futarchy
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
+//! DATE: `2024-10-20`, STEPS: `2`, REPEAT: `0`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `blackbird`, CPU: `<UNKNOWN>`
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/zeitgeist
+// benchmark
+// pallet
+// --chain=dev
+// --steps=2
+// --repeat=0
+// --pallet=zrml_futarchy
+// --extrinsic=*
+// --execution=native
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --template=./misc/weight_template.hbs
+// --header=./HEADER_GPL3
+// --output=./zrml/futarchy/src/weights.rs
+
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+
+use core::marker::PhantomData;
+use frame_support::{traits::Get, weights::Weight};
+
+///  Trait containing the required functions for weight retrival within
+/// zrml_futarchy (automatically generated)
+pub trait WeightInfoZeitgeist {
+    fn submit_proposal() -> Weight;
+    fn maybe_schedule_proposal() -> Weight;
+}
+
+/// Weight functions for zrml_futarchy (automatically generated)
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> WeightInfoZeitgeist for WeightInfo<T> {
+    /// Storage: `Futarchy::Proposals` (r:1 w:1)
+    /// Proof: `Futarchy::Proposals` (`max_values`: None, `max_size`: Some(3561), added: 6036, mode: `MaxEncodedLen`)
+    fn submit_proposal() -> Weight {
+        // Proof Size summary in bytes:
+        //  Measured:  `41`
+        //  Estimated: `7026`
+        // Minimum execution time: 13_000 nanoseconds.
+        Weight::from_parts(13_000_000, 7026)
+            .saturating_add(T::DbWeight::get().reads(1))
+            .saturating_add(T::DbWeight::get().writes(1))
+    }
+    /// Storage: `NeoSwaps::Pools` (r:1 w:0)
+    /// Proof: `NeoSwaps::Pools` (`max_values`: None, `max_size`: Some(146552), added: 149027, mode: `MaxEncodedLen`)
+    /// Storage: `Scheduler::Agenda` (r:1 w:1)
+    /// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(109074), added: 111549, mode: `MaxEncodedLen`)
+    fn maybe_schedule_proposal() -> Weight {
+        // Proof Size summary in bytes:
+        //  Measured:  `368`
+        //  Estimated: `150017`
+        // Minimum execution time: 55_000 nanoseconds.
+        Weight::from_parts(55_000_000, 150017)
+            .saturating_add(T::DbWeight::get().reads(2))
+            .saturating_add(T::DbWeight::get().writes(1))
+    }
+}

zrml/neo-swaps/src/types/decision_market_benchmark_helper.rs

@@ -3,30 +3,22 @@
 use crate::{
     liquidity_tree::types::LiquidityTree,
     types::{DecisionMarketOracle, Pool},
-    BalanceOf, Config, MarketIdOf, Pallet, Pools, MIN_SWAP_FEE,
+    BalanceOf, Config, MarketIdOf, Pallet, Pools,
 };
 use alloc::collections::BTreeMap;
 use core::marker::PhantomData;
-use frame_benchmarking::whitelisted_caller;
-use orml_traits::MultiCurrency;
-use sp_runtime::{traits::Zero, Perbill, SaturatedConversion, Saturating};
+use sp_runtime::{traits::Zero, Saturating};
 use zeitgeist_primitives::{
-    constants::{BASE, CENT},
     math::fixed::{BaseProvider, ZeitgeistBase},
-    traits::{CompleteSetOperationsApi, FutarchyBenchmarkHelper, MarketBuilderTrait},
-    types::{Asset, MarketCreation, MarketPeriod, MarketStatus, MarketType, ScoringRule},
+    traits::FutarchyBenchmarkHelper,
+    types::Asset,
 };
-use zrml_market_commons::{types::MarketBuilder, MarketCommonsPalletApi};
 
 pub struct DecisionMarketBenchmarkHelper<T>(PhantomData<T>);
 
 impl<T> FutarchyBenchmarkHelper<DecisionMarketOracle<T>> for DecisionMarketBenchmarkHelper<T>
 where
-    T: Config + zrml_market_commons::Config,
-    <zrml_market_commons::Pallet<T> as MarketCommonsPalletApi>::MarketId:
-        Into<<T as zrml_market_commons::Config>::MarketId>,
-    <T as zrml_market_commons::Config>::MarketId:
-        Into<<zrml_market_commons::Pallet<T> as MarketCommonsPalletApi>::MarketId>,
+    T: Config,
 {
     /// Creates a mocked up pool with prices so that the returned decision market oracle evaluates
     /// to `value`. The pool is technically in invalid state.
@@ -54,7 +46,7 @@ where
             account_id: account_id.clone(),
             reserves: reserves.try_into().unwrap(),
             collateral,
-            liquidity_parameter: one.clone(),
+            liquidity_parameter: one,
             liquidity_shares_manager: LiquidityTree::new(account_id, one).unwrap(),
             swap_fee: Zero::zero(),
         };

zrml/neo-swaps/src/types/decision_market_oracle.rs

@@ -16,7 +16,6 @@
 // along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{traits::pool_operations::PoolOperations, AssetOf, Config, Error, MarketIdOf, Pools};
-use alloc::format;
 use frame_support::pallet_prelude::Weight;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;