Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Make the number of nominations configurable #8368

Merged
53 commits merged into from
Mar 25, 2021
Merged

Make the number of nominations configurable #8368

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
d998b12
Base features and traits.
kianenigma Jan 15, 2021
5aea9cc
pallet and unsigned phase
kianenigma Jan 15, 2021
632e107
Undo bad formattings.
kianenigma Jan 15, 2021
c52e65d
Master.into()
kianenigma Jan 18, 2021
b4fc5e1
some formatting cleanup.
kianenigma Jan 18, 2021
cc26881
Small self-cleanup.
kianenigma Jan 18, 2021
67a9fae
Master.into()
kianenigma Jan 27, 2021
75eca3f
Make it all build
kianenigma Jan 27, 2021
8daec3a
self-review
kianenigma Jan 27, 2021
49613ed
Some doc tests.
kianenigma Jan 27, 2021
35f1faf
Some changes from other PR
kianenigma Jan 27, 2021
e01cacc
Fix session test
kianenigma Jan 27, 2021
6278150
Merge branch 'master' into kiz-election-provider-2-two-phase-unsigned
shawntabrizi Feb 4, 2021
4c516cb
Update Cargo.lock
shawntabrizi Feb 4, 2021
8c8d1e6
Update frame/election-provider-multi-phase/src/lib.rs
kianenigma Feb 11, 2021
4b58c91
Some review comments
kianenigma Feb 11, 2021
f4029aa
Merge branch 'kiz-election-provider-2-two-phase-unsigned' of github.c…
kianenigma Feb 11, 2021
f16ac88
Master.into()
kianenigma Feb 11, 2021
528917e
Rename + make encode/decode
kianenigma Feb 12, 2021
1a5794a
Do an assert as well, just in case.
kianenigma Feb 12, 2021
01e63ed
Fix build
kianenigma Feb 12, 2021
4ccecdf
Update frame/election-provider-multi-phase/src/unsigned.rs
kianenigma Feb 12, 2021
83a789e
Las comment
kianenigma Feb 12, 2021
adb3618
Merge branch 'kiz-election-provider-2-two-phase-unsigned' of github.c…
kianenigma Feb 12, 2021
7c71df0
fix staking fuzzer.
kianenigma Feb 12, 2021
12b1640
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Feb 12, 2021
6397d4a
Add one last layer of feasibility check as well.
kianenigma Feb 12, 2021
80d3c31
Merge branch 'kiz-election-provider-2-two-phase-unsigned' of github.c…
kianenigma Feb 12, 2021
7d6f6ad
Last fixes to benchmarks
kianenigma Feb 12, 2021
2e28437
Some more docs.
kianenigma Feb 12, 2021
5fda744
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Feb 12, 2021
1ce6c8e
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Feb 12, 2021
f63c5b8
Some nits
kianenigma Feb 12, 2021
8029c01
Merge branch 'kiz-election-provider-2-two-phase-unsigned' of github.c…
kianenigma Feb 12, 2021
5973b61
It all works
kianenigma Feb 13, 2021
0882c62
Master.into()
kianenigma Mar 8, 2021
e137035
Some self cleanup
kianenigma Mar 9, 2021
428c4c9
Master.into()
kianenigma Mar 12, 2021
a16b964
Update frame/staking/src/lib.rs
kianenigma Mar 12, 2021
6d506a4
remove most todos.
kianenigma Mar 12, 2021
75accd3
Merge branch 'kiz-election-provider-21-enable-multi-phase' of github.…
kianenigma Mar 12, 2021
df3fb9a
Round of self-review.
kianenigma Mar 12, 2021
e76af15
Merge branch 'master' of github.com:paritytech/substrate into kiz-ele…
kianenigma Mar 12, 2021
530ab32
Fix migration
kianenigma Mar 13, 2021
9a61b20
Merge branch 'master' of github.com:paritytech/substrate into kiz-ele…
kianenigma Mar 14, 2021
c92be7e
clean macro
kianenigma Mar 14, 2021
794f0ed
Master.into()
kianenigma Mar 16, 2021
789b35c
Revert wrong merge
kianenigma Mar 16, 2021
cfcdb54
Make the number of nominations configurable
kianenigma Mar 16, 2021
6ecafa2
Master.into()
kianenigma Mar 23, 2021
2004acb
Merge branch 'master' of github.com:paritytech/substrate into kiz-ele…
kianenigma Mar 24, 2021
0b1cb15
Self reivew
kianenigma Mar 24, 2021
07e7285
renmae.
kianenigma Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Master.into()
  • Loading branch information
@kianenigma
kianenigma committed Feb 11, 2021
commit f16ac88a04b6af68a2ef0cce215fca9935643616
367 changes: 161 additions & 206 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions bin/node/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,34 +55,34 @@ pallet-contracts-primitives = { version = "2.0.0", default-features = false, pat
pallet-contracts-rpc-runtime-api = { version = "0.8.0", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
pallet-democracy = { version = "3.0.0", default-features = false, path = "../../../frame/democracy" }
pallet-elections-phragmen = { version = "3.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../../frame/grandpa" }
pallet-im-online = { version = "2.0.0", default-features = false, path = "../../../frame/im-online" }
pallet-indices = { version = "2.0.0", default-features = false, path = "../../../frame/indices" }
pallet-identity = { version = "2.0.0", default-features = false, path = "../../../frame/identity" }
pallet-lottery = { version = "2.0.0", default-features = false, path = "../../../frame/lottery" }
pallet-membership = { version = "2.0.0", default-features = false, path = "../../../frame/membership" }
pallet-mmr = { version = "2.0.0", default-features = false, path = "../../../frame/merkle-mountain-range" }
pallet-multisig = { version = "2.0.0", default-features = false, path = "../../../frame/multisig" }
pallet-offences = { version = "2.0.0", default-features = false, path = "../../../frame/offences" }
pallet-offences-benchmarking = { version = "2.0.0", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
pallet-proxy = { version = "2.0.0", default-features = false, path = "../../../frame/proxy" }
pallet-randomness-collective-flip = { version = "2.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
pallet-recovery = { version = "2.0.0", default-features = false, path = "../../../frame/recovery" }
pallet-session = { version = "2.0.0", features = ["historical"], path = "../../../frame/session", default-features = false }
pallet-session-benchmarking = { version = "2.0.0", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
pallet-staking = { version = "2.0.0", default-features = false, path = "../../../frame/staking" }
pallet-election-provider-multi-phase = { version = "2.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
pallet-staking-reward-curve = { version = "2.0.0", default-features = false, path = "../../../frame/staking/reward-curve" }
pallet-scheduler = { version = "2.0.0", default-features = false, path = "../../../frame/scheduler" }
pallet-society = { version = "2.0.0", default-features = false, path = "../../../frame/society" }
pallet-sudo = { version = "2.0.0", default-features = false, path = "../../../frame/sudo" }
pallet-timestamp = { version = "2.0.0", default-features = false, path = "../../../frame/timestamp" }
pallet-tips = { version = "2.0.0", default-features = false, path = "../../../frame/tips" }
pallet-treasury = { version = "2.0.0", default-features = false, path = "../../../frame/treasury" }
pallet-utility = { version = "2.0.0", default-features = false, path = "../../../frame/utility" }
pallet-transaction-payment = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment" }
pallet-transaction-payment-rpc-runtime-api = { version = "2.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
pallet-vesting = { version = "2.0.0", default-features = false, path = "../../../frame/vesting" }
pallet-election-provider-multi-phase = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
pallet-indices = { version = "3.0.0", default-features = false, path = "../../../frame/indices" }
pallet-identity = { version = "3.0.0", default-features = false, path = "../../../frame/identity" }
pallet-lottery = { version = "3.0.0", default-features = false, path = "../../../frame/lottery" }
pallet-membership = { version = "3.0.0", default-features = false, path = "../../../frame/membership" }
pallet-mmr = { version = "3.0.0", default-features = false, path = "../../../frame/merkle-mountain-range" }
pallet-multisig = { version = "3.0.0", default-features = false, path = "../../../frame/multisig" }
pallet-offences = { version = "3.0.0", default-features = false, path = "../../../frame/offences" }
pallet-offences-benchmarking = { version = "3.0.0", path = "../../../frame/offences/benchmarking", default-features = false, optional = true }
pallet-proxy = { version = "3.0.0", default-features = false, path = "../../../frame/proxy" }
pallet-randomness-collective-flip = { version = "3.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
pallet-recovery = { version = "3.0.0", default-features = false, path = "../../../frame/recovery" }
pallet-session = { version = "3.0.0", features = ["historical"], path = "../../../frame/session", default-features = false }
pallet-session-benchmarking = { version = "3.0.0", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
pallet-staking = { version = "3.0.0", default-features = false, path = "../../../frame/staking" }
pallet-staking-reward-curve = { version = "3.0.0", default-features = false, path = "../../../frame/staking/reward-curve" }
pallet-scheduler = { version = "3.0.0", default-features = false, path = "../../../frame/scheduler" }
pallet-society = { version = "3.0.0", default-features = false, path = "../../../frame/society" }
pallet-sudo = { version = "3.0.0", default-features = false, path = "../../../frame/sudo" }
pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
pallet-tips = { version = "3.0.0", default-features = false, path = "../../../frame/tips" }
pallet-treasury = { version = "3.0.0", default-features = false, path = "../../../frame/treasury" }
pallet-utility = { version = "3.0.0", default-features = false, path = "../../../frame/utility" }
pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment" }
pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", default-features = false, path = "../../../frame/transaction-payment/rpc/runtime-api/" }
pallet-vesting = { version = "3.0.0", default-features = false, path = "../../../frame/vesting" }

[build-dependencies]
substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builder" }
Expand Down
13 changes: 6 additions & 7 deletions frame/babe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@ sp-std = { version = "3.0.0", default-features = false, path = "../../primitives
sp-timestamp = { version = "3.0.0", default-features = false, path = "../../primitives/timestamp" }

[dev-dependencies]
frame-benchmarking = { version = "2.0.0", path = "../benchmarking" }
pallet-balances = { version = "2.0.0", path = "../balances" }
pallet-offences = { version = "2.0.0", path = "../offences" }
pallet-staking = { version = "2.0.0", path = "../staking" }
pallet-staking-reward-curve = { version = "2.0.0", path = "../staking/reward-curve" }
sp-core = { version = "2.0.0", path = "../../primitives/core" }
sp-election-providers = { version = "2.0.0", path = "../../primitives/election-providers" }
pallet-balances = { version = "3.0.0", path = "../balances" }
pallet-offences = { version = "3.0.0", path = "../offences" }
pallet-staking = { version = "3.0.0", path = "../staking" }
pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
sp-core = { version = "3.0.0", path = "../../primitives/core" }
sp-election-providers = { version = "3.0.0", path = "../../primitives/election-providers" }

[features]
default = ["std"]
Expand Down
37 changes: 18 additions & 19 deletions frame/election-provider-multi-phase/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-election-provider-multi-phase"
version = "2.0.0"
version = "3.0.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -15,35 +15,34 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
static_assertions = "1.1.0"
serde = { version = "1.0.101", optional = true }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }

frame-support = { version = "2.0.0", default-features = false, path = "../support" }
frame-system = { version = "2.0.0", default-features = false, path = "../system" }
frame-support = { version = "3.0.0", default-features = false, path = "../support" }
frame-system = { version = "3.0.0", default-features = false, path = "../system" }

sp-io ={ version = "2.0.0", default-features = false, path = "../../primitives/io" }
sp-std = { version = "2.0.0", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "2.0.0", default-features = false, path = "../../primitives/runtime" }
sp-npos-elections = { version = "2.0.0", default-features = false, path = "../../primitives/npos-elections" }
sp-arithmetic = { version = "2.0.0", default-features = false, path = "../../primitives/arithmetic" }
sp-election-providers = { version = "2.0.0", default-features = false, path = "../../primitives/election-providers" }
sp-io ={ version = "3.0.0", default-features = false, path = "../../primitives/io" }
sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
sp-npos-elections = { version = "3.0.0", default-features = false, path = "../../primitives/npos-elections" }
sp-arithmetic = { version = "3.0.0", default-features = false, path = "../../primitives/arithmetic" }
sp-election-providers = { version = "3.0.0", default-features = false, path = "../../primitives/election-providers" }

# Optional imports for benchmarking
frame-benchmarking = { version = "2.0.0", default-features = false, path = "../benchmarking", optional = true }
frame-benchmarking = { version = "3.0.0", default-features = false, path = "../benchmarking", optional = true }
rand = { version = "0.7.3", default-features = false, optional = true, features = ["alloc", "small_rng"] }

[dev-dependencies]
sp-io = { version = "2.0.0", path = "../../primitives/io" }
hex-literal = "0.3.1"
pallet-balances = { version = "2.0.0", path = "../balances" }
sp-core = { version = "2.0.0", path = "../../primitives/core" }
paste = "1.0.3"
substrate-test-utils = { version = "2.0.0", path = "../../test-utils" }
parking_lot = "0.11.0"
sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
rand = { version = "0.7.3" }
hex-literal = "0.3.1"
substrate-test-utils = { version = "3.0.0", path = "../../test-utils" }
sp-io = { version = "3.0.0", path = "../../primitives/io" }
sp-core = { version = "3.0.0", path = "../../primitives/core" }
sp-tracing = { version = "3.0.0", path = "../../primitives/tracing" }
sp-election-providers = { version = "3.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }
pallet-balances = { version = "3.0.0", path = "../balances" }
frame-benchmarking = { path = "../benchmarking" }
sp-election-providers = { version = "2.0.0", features = ["runtime-benchmarks"], path = "../../primitives/election-providers" }


[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion frame/election-provider-multi-phase/src/unsigned.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ mod tests {
#[test]
#[should_panic(expected = "Invalid unsigned submission must produce invalid block and \
deprive validator from their authoring reward.: \
DispatchError::Module { index: 0, error: 1, message: \
DispatchError::Module { index: 2, error: 1, message: \
Some(\"PreDispatchWrongWinnerCount\") }")]
fn unfeasible_solution_panics() {
ExtBuilder::default().build_and_execute(|| {
Expand Down
16 changes: 8 additions & 8 deletions frame/grandpa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ pallet-session = { version = "3.0.0", default-features = false, path = "../sessi
[dev-dependencies]
frame-benchmarking = { version = "3.0.0", path = "../benchmarking" }
grandpa = { package = "finality-grandpa", version = "0.13.0", features = ["derive-codec"] }
sp-io = { version = "2.0.0", path = "../../primitives/io" }
sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
pallet-balances = { version = "2.0.0", path = "../balances" }
pallet-offences = { version = "2.0.0", path = "../offences" }
pallet-staking = { version = "2.0.0", path = "../staking" }
pallet-staking-reward-curve = { version = "2.0.0", path = "../staking/reward-curve" }
pallet-timestamp = { version = "2.0.0", path = "../timestamp" }
sp-election-providers = { version = "2.0.0", path = "../../primitives/election-providers" }
sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
sp-io = { version = "3.0.0", path = "../../primitives/io" }
pallet-balances = { version = "3.0.0", path = "../balances" }
pallet-offences = { version = "3.0.0", path = "../offences" }
pallet-staking = { version = "3.0.0", path = "../staking" }
pallet-staking-reward-curve = { version = "3.0.0", path = "../staking/reward-curve" }
pallet-timestamp = { version = "3.0.0", path = "../timestamp" }
sp-election-providers = { version = "3.0.0", path = "../../primitives/election-providers" }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion frame/grandpa/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ use frame_support::{
use pallet_staking::EraIndex;
use sp_core::{crypto::KeyTypeId, H256};
use sp_finality_grandpa::{RoundNumber, SetId, GRANDPA_ENGINE_ID};
use sp_io;
use sp_keyring::Ed25519Keyring;
use sp_runtime::{
curve::PiecewiseLinear,
Expand All @@ -40,6 +39,7 @@ use sp_runtime::{
DigestItem, Perbill,
};
use sp_staking::SessionIndex;
use pallet_session::historical as pallet_session_historical;
use sp_election_providers::onchain;

type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
Expand Down
28 changes: 14 additions & 14 deletions frame/offences/benchmarking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../benchmarking" }
frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
pallet-babe = { version = "2.0.0", default-features = false, path = "../../babe" }
pallet-balances = { version = "2.0.0", default-features = false, path = "../../balances" }
pallet-grandpa = { version = "2.0.0", default-features = false, path = "../../grandpa" }
pallet-im-online = { version = "2.0.0", default-features = false, path = "../../im-online" }
pallet-offences = { version = "2.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
pallet-session = { version = "2.0.0", default-features = false, path = "../../session" }
pallet-staking = { version = "2.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-staking = { version = "2.0.0", default-features = false, path = "../../../primitives/staking" }
sp-election-providers = { version = "2.0.0", default-features = false, path = "../../../primitives/election-providers" }
sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../benchmarking" }
frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
pallet-babe = { version = "3.0.0", default-features = false, path = "../../babe" }
pallet-balances = { version = "3.0.0", default-features = false, path = "../../balances" }
pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../grandpa" }
pallet-im-online = { version = "3.0.0", default-features = false, path = "../../im-online" }
pallet-offences = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
pallet-session = { version = "3.0.0", default-features = false, path = "../../session" }
pallet-staking = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-staking = { version = "3.0.0", default-features = false, path = "../../../primitives/staking" }
sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
sp-election-providers = { version = "3.0.0", default-features = false, path = "../../../primitives/election-providers" }

[dev-dependencies]
pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-curve" }
Expand Down
18 changes: 9 additions & 9 deletions frame/session/benchmarking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
sp-std = { version = "2.0.0", default-features = false, path = "../../../primitives/std" }
sp-session = { version = "2.0.0", default-features = false, path = "../../../primitives/session" }
sp-runtime = { version = "2.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-election-providers = { version = "2.0.0", default-features = false, path = "../../../primitives/election-providers" }
frame-system = { version = "2.0.0", default-features = false, path = "../../system" }
frame-benchmarking = { version = "2.0.0", default-features = false, path = "../../benchmarking" }
frame-support = { version = "2.0.0", default-features = false, path = "../../support" }
pallet-staking = { version = "2.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
pallet-session = { version = "2.0.0", default-features = false, path = "../../session" }
sp-session = { version = "3.0.0", default-features = false, path = "../../../primitives/session" }
sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" }
sp-std = { version = "3.0.0", default-features = false, path = "../../../primitives/std" }
frame-system = { version = "3.0.0", default-features = false, path = "../../system" }
frame-benchmarking = { version = "3.0.0", default-features = false, path = "../../benchmarking" }
frame-support = { version = "3.0.0", default-features = false, path = "../../support" }
pallet-staking = { version = "3.0.0", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
pallet-session = { version = "3.0.0", default-features = false, path = "../../session" }
rand = { version = "0.7.2", default-features = false }

[dev-dependencies]
Expand All @@ -32,6 +31,7 @@ pallet-staking-reward-curve = { version = "3.0.0", path = "../../staking/reward-
sp-io ={ version = "3.0.0", path = "../../../primitives/io" }
pallet-timestamp = { version = "3.0.0", path = "../../timestamp" }
pallet-balances = { version = "3.0.0", path = "../../balances" }
sp-election-providers = { version = "3.0.0", path = "../../../primitives/election-providers" }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion frame/session/benchmarking/src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#![cfg(test)]

use sp_runtime::traits::IdentityLookup;
use frame_support::{impl_outer_origin, impl_outer_dispatch, parameter_types};
use sp_election_providers::onchain;
use frame_support::parameter_types;

type AccountId = u64;
type AccountIndex = u32;
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.