mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 21:01:02 +00:00
Fix nostd build of several crates (#4060)
Preparation for https://github.com/paritytech/polkadot-sdk/pull/3935 Changes: - Add some `default-features = false` for the case that a crate and that dependency both support nostd builds. - Shuffle files around of some benchmarking-only crates. These conditionally disabled the `cfg_attr` for nostd and pulled in libstd. Example [here](https://github.com/ggwpez/zepter/pull/95). The actual logic is moved into a `inner.rs` to preserve nostd capability of the crate in case the benchmarking feature is disabled. - Add some `use sp_std::vec` where needed. - Remove some `optional = true` in cases where it was not optional. - Removed one superfluous `cfg_attr(not(feature = "std"), no_std..`. All in all this should be logical no-op. --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Oliver Tale-Yazdi
committed by
GitHub
GitHub
parent
bfbf7f5d6f
commit
7a2c9d4a9a
@@ -0,0 +1,89 @@
|
||||
// This file is part of Substrate.
|
||||
|
||||
// Copyright (C) Parity Technologies (UK) Ltd.
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
//! Election provider support pallet benchmarking.
|
||||
//! This is separated into its own crate to avoid bloating the size of the runtime.
|
||||
|
||||
use codec::Decode;
|
||||
use frame_benchmarking::v1::benchmarks;
|
||||
use frame_election_provider_support::{NposSolver, PhragMMS, SequentialPhragmen};
|
||||
use sp_std::vec::Vec;
|
||||
|
||||
pub struct Pallet<T: Config>(frame_system::Pallet<T>);
|
||||
pub trait Config: frame_system::Config {}
|
||||
|
||||
const VOTERS: [u32; 2] = [1_000, 2_000];
|
||||
const TARGETS: [u32; 2] = [500, 1_000];
|
||||
const VOTES_PER_VOTER: [u32; 2] = [5, 16];
|
||||
|
||||
const SEED: u32 = 999;
|
||||
fn set_up_voters_targets<AccountId: Decode + Clone>(
|
||||
voters_len: u32,
|
||||
targets_len: u32,
|
||||
degree: usize,
|
||||
) -> (Vec<(AccountId, u64, impl IntoIterator<Item = AccountId>)>, Vec<AccountId>) {
|
||||
// fill targets.
|
||||
let mut targets = (0..targets_len)
|
||||
.map(|i| frame_benchmarking::account::<AccountId>("Target", i, SEED))
|
||||
.collect::<Vec<_>>();
|
||||
assert!(targets.len() > degree, "we should always have enough voters to fill");
|
||||
targets.truncate(degree);
|
||||
|
||||
// fill voters.
|
||||
let voters = (0..voters_len)
|
||||
.map(|i| {
|
||||
let voter = frame_benchmarking::account::<AccountId>("Voter", i, SEED);
|
||||
(voter, 1_000, targets.clone())
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
(voters, targets)
|
||||
}
|
||||
|
||||
benchmarks! {
|
||||
phragmen {
|
||||
// number of votes in snapshot.
|
||||
let v in (VOTERS[0]) .. VOTERS[1];
|
||||
// number of targets in snapshot.
|
||||
let t in (TARGETS[0]) .. TARGETS[1];
|
||||
// number of votes per voter (ie the degree).
|
||||
let d in (VOTES_PER_VOTER[0]) .. VOTES_PER_VOTER[1];
|
||||
|
||||
let (voters, targets) = set_up_voters_targets::<T::AccountId>(v, t, d as usize);
|
||||
}: {
|
||||
assert!(
|
||||
SequentialPhragmen::<T::AccountId, sp_runtime::Perbill>
|
||||
::solve(d as usize, targets, voters).is_ok()
|
||||
);
|
||||
}
|
||||
|
||||
phragmms {
|
||||
// number of votes in snapshot.
|
||||
let v in (VOTERS[0]) .. VOTERS[1];
|
||||
// number of targets in snapshot.
|
||||
let t in (TARGETS[0]) .. TARGETS[1];
|
||||
// number of votes per voter (ie the degree).
|
||||
let d in (VOTES_PER_VOTER[0]) .. VOTES_PER_VOTER[1];
|
||||
|
||||
let (voters, targets) = set_up_voters_targets::<T::AccountId>(v, t, d as usize);
|
||||
}: {
|
||||
assert!(
|
||||
PhragMMS::<T::AccountId, sp_runtime::Perbill>
|
||||
::solve(d as usize, targets, voters).is_ok()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -16,77 +16,11 @@
|
||||
// limitations under the License.
|
||||
|
||||
//! Election provider support pallet benchmarking.
|
||||
//! This is separated into its own crate to avoid bloating the size of the runtime.
|
||||
|
||||
#![cfg(feature = "runtime-benchmarks")]
|
||||
#![cfg_attr(not(feature = "std"), no_std)]
|
||||
|
||||
use codec::Decode;
|
||||
use frame_benchmarking::v1::benchmarks;
|
||||
use frame_election_provider_support::{NposSolver, PhragMMS, SequentialPhragmen};
|
||||
use sp_std::vec::Vec;
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
pub mod inner;
|
||||
|
||||
pub struct Pallet<T: Config>(frame_system::Pallet<T>);
|
||||
pub trait Config: frame_system::Config {}
|
||||
|
||||
const VOTERS: [u32; 2] = [1_000, 2_000];
|
||||
const TARGETS: [u32; 2] = [500, 1_000];
|
||||
const VOTES_PER_VOTER: [u32; 2] = [5, 16];
|
||||
|
||||
const SEED: u32 = 999;
|
||||
fn set_up_voters_targets<AccountId: Decode + Clone>(
|
||||
voters_len: u32,
|
||||
targets_len: u32,
|
||||
degree: usize,
|
||||
) -> (Vec<(AccountId, u64, impl IntoIterator<Item = AccountId>)>, Vec<AccountId>) {
|
||||
// fill targets.
|
||||
let mut targets = (0..targets_len)
|
||||
.map(|i| frame_benchmarking::account::<AccountId>("Target", i, SEED))
|
||||
.collect::<Vec<_>>();
|
||||
assert!(targets.len() > degree, "we should always have enough voters to fill");
|
||||
targets.truncate(degree);
|
||||
|
||||
// fill voters.
|
||||
let voters = (0..voters_len)
|
||||
.map(|i| {
|
||||
let voter = frame_benchmarking::account::<AccountId>("Voter", i, SEED);
|
||||
(voter, 1_000, targets.clone())
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
(voters, targets)
|
||||
}
|
||||
|
||||
benchmarks! {
|
||||
phragmen {
|
||||
// number of votes in snapshot.
|
||||
let v in (VOTERS[0]) .. VOTERS[1];
|
||||
// number of targets in snapshot.
|
||||
let t in (TARGETS[0]) .. TARGETS[1];
|
||||
// number of votes per voter (ie the degree).
|
||||
let d in (VOTES_PER_VOTER[0]) .. VOTES_PER_VOTER[1];
|
||||
|
||||
let (voters, targets) = set_up_voters_targets::<T::AccountId>(v, t, d as usize);
|
||||
}: {
|
||||
assert!(
|
||||
SequentialPhragmen::<T::AccountId, sp_runtime::Perbill>
|
||||
::solve(d as usize, targets, voters).is_ok()
|
||||
);
|
||||
}
|
||||
|
||||
phragmms {
|
||||
// number of votes in snapshot.
|
||||
let v in (VOTERS[0]) .. VOTERS[1];
|
||||
// number of targets in snapshot.
|
||||
let t in (TARGETS[0]) .. TARGETS[1];
|
||||
// number of votes per voter (ie the degree).
|
||||
let d in (VOTES_PER_VOTER[0]) .. VOTES_PER_VOTER[1];
|
||||
|
||||
let (voters, targets) = set_up_voters_targets::<T::AccountId>(v, t, d as usize);
|
||||
}: {
|
||||
assert!(
|
||||
PhragMMS::<T::AccountId, sp_runtime::Perbill>
|
||||
::solve(d as usize, targets, voters).is_ok()
|
||||
);
|
||||
}
|
||||
}
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
pub use inner::*;
|
||||
|
||||
Reference in New Issue
Block a user