Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
aa83f22
initial doc for the staking module
kianenigma Mar 9, 2019
b9d09bb
Remove md style links.
kianenigma Mar 9, 2019
7df2b19
Remove todos.
kianenigma Mar 9, 2019
28b959b
Add rust code types
kianenigma Mar 9, 2019
91be68b
Rename and fix review notes.
kianenigma Mar 11, 2019
5912ff5
Add new md file
kianenigma Mar 11, 2019
64ca546
Final touches.
kianenigma Mar 11, 2019
a8ba78e
Migrate compleatly to rustdoc
kianenigma Mar 11, 2019
982d7e8
Update link
kianenigma Mar 11, 2019
4a572a2
Fix heading
kianenigma Mar 11, 2019
ea5ae00
Merge branch 'master' into kiz-document-staking
kianenigma Mar 12, 2019
89682a6
Final touches wrt the new template.
kianenigma Mar 12, 2019
956ec96
Remove empty prereq.
kianenigma Mar 12, 2019
2879e1d
Fix more reviews
kianenigma Mar 12, 2019
105723b
Some final nits.
kianenigma Mar 12, 2019
531ae73
Merge branch 'master' of github.com:paritytech/substrate into kiz-doc…
kianenigma Mar 14, 2019
5567859
Fix some side issues.
kianenigma Mar 14, 2019
e739361
Fix another set of reviews
kianenigma Mar 15, 2019
4eb568c
Fix + stabilize leftover reivews.
kianenigma Mar 15, 2019
9b026cc
Remove unused test parameters
kianenigma Mar 15, 2019
a8075c7
Fix typo.
kianenigma Mar 15, 2019
a33205b
Merge redundant loops
kianenigma Mar 15, 2019
07f9710
Merge branch 'kiz-document-staking' into kiz-staking-enhance
kianenigma Mar 15, 2019
cfb39b9
Adds phantom self-vote
kianenigma Mar 16, 2019
a4c298c
Fix broken tests.
kianenigma Mar 17, 2019
5eb6f24
Refactor some names to match the reference.
kianenigma Mar 17, 2019
c4bdb81
Remove redundant inner loops from election round.
kianenigma Mar 18, 2019
03d7583
Introduce phragmen post-processing.
kianenigma Mar 19, 2019
bf8212f
Some fixes and todos.
kianenigma Mar 19, 2019
85f1294
Fix some tests with new phragmen params
kianenigma Mar 21, 2019
eb6d9b5
master.into()
kianenigma Mar 21, 2019
54c1417
Fix test
gavofyork Mar 21, 2019
abc1685
Bump spec
gavofyork Mar 21, 2019
0cdc3c1
Fix wasm build
gavofyork Mar 21, 2019
0d429d8
Fix tests and phragmen fallback. Avoid double-controlling
gavofyork Mar 22, 2019
ae0f53e
Fix and rebuild wasm
gavofyork Mar 22, 2019
7b301ad
Whitespaces, whitespaces everywhere.
kianenigma Mar 22, 2019
1488960
Merge remote-tracking branch 'origin/master' into kiz-staking-enhance
gavofyork Mar 22, 2019
f6b9fbc
Rebuild
gavofyork Mar 22, 2019
c26f890
Disable post-processing.
kianenigma Mar 22, 2019
f40f671
Merge test conflicts.
kianenigma Mar 22, 2019
b399c8a
Identify by stash, not controller account.
gavofyork Mar 22, 2019
d3e5539
Couple of fixes
gavofyork Mar 22, 2019
fcce528
Fix first test
gavofyork Mar 22, 2019
202f67b
Merge branch 'kiz-staking-enhance' of github.com:paritytech/substrate…
gavofyork Mar 22, 2019
6c64125
Fix invulnerability_should_work
gavofyork Mar 22, 2019
badd121
Fix a couple more tests
gavofyork Mar 22, 2019
7b83e30
Fix more tests
gavofyork Mar 22, 2019
a9a3a92
Fix more tests
gavofyork Mar 22, 2019
f14977d
Fix more tests
gavofyork Mar 22, 2019
a41aeec
Fix some tests
kianenigma Mar 22, 2019
f584fd1
Merge branch 'kiz-staking-enhance' of github.com:paritytech/substrate…
kianenigma Mar 22, 2019
817d538
Fix update-ledger.
gavofyork Mar 22, 2019
1257dfe
Merge remote-tracking branch 'origin/kiz-staking-enhance' into kiz-st…
gavofyork Mar 22, 2019
a879983
Fix update-ledger.
gavofyork Mar 22, 2019
0d6136d
Fix another test
gavofyork Mar 22, 2019
0dbff72
Fix another test
gavofyork Mar 22, 2019
184cb5c
Fix rest of staking tests
gavofyork Mar 22, 2019
1b4b05f
Remove printlns
gavofyork Mar 22, 2019
1be69c2
Rebuild wasm
gavofyork Mar 22, 2019
d380360
Merge remote-tracking branch 'origin/master' into kiz-staking-enhance
gavofyork Mar 22, 2019
f255ef5
Fix & tests for auth/val syncing
gavofyork Mar 22, 2019
fd5b2cd
Merge remote-tracking branch 'origin/master' into kiz-staking-enhance
gavofyork Mar 22, 2019
e20b766
Fix up threading for tests
gavofyork Mar 22, 2019
4d8a2fd
Remove superfluous asserts
gavofyork Mar 22, 2019
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
Fix typo.
  • Loading branch information
kianenigma committed Mar 15, 2019
commit a8075c74233e6b6347f756e76a89657e7182397c
4 changes: 2 additions & 2 deletions srml/staking/src/phragmen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ pub fn elect<T: Trait + 'static, FR, FN, FV, FS>(
// Main election loop
for _round in 0..rounds {
// Loop 1: initialize score
for nominaotion in &nominations {
for vote in &nominaotion.nominees {
for nomination in &nominations {
for vote in &nomination.nominees {
if let Some(c) = candidates.iter_mut().find(|i| i.who == vote.who) {
c.score = Perquintill::from_xth(c.approval_stake.as_());
}
Expand Down