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
43 commits
Select commit Hold shift + click to select a range
840dde0
Initial work on relative slots for BABE
Demi-Marie Jun 6, 2019
525db62
Merge remote-tracking branch 'origin/master' into demi-relative-slots
Demi-Marie Jun 6, 2019
26c9216
Merge remote-tracking branch 'origin/master' into demi-relative-slots
Demi-Marie Jun 7, 2019
45cc84a
More work
Demi-Marie Jun 7, 2019
b9639c5
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 7, 2019
c0ba761
Update core/consensus/babe/src/lib.rs
Demi-Marie Jun 7, 2019
9deafa0
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 9, 2019
d2143eb
More work on relative slots
Demi-Marie Jun 10, 2019
5ac939b
Add missing field in test-runtime
Demi-Marie Jun 10, 2019
d67ec03
Bump `impl_version` and `authoring_version`
Demi-Marie Jun 10, 2019
527c460
Fix compile errors and warnings
Demi-Marie Jun 10, 2019
6dcb87a
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 11, 2019
948bd80
Upgrade dependencies
Demi-Marie Jun 11, 2019
dedf739
Update dependencies more
Demi-Marie Jun 11, 2019
286c1c1
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 11, 2019
5fb2586
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 11, 2019
ea97fe2
Revert some updates to dependencies
Demi-Marie Jun 11, 2019
65660fe
Merge remote-tracking branch 'origin/master' into demi-relative-slots
Demi-Marie Jun 12, 2019
3c8f864
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 12, 2019
93227b1
Fix compilation errors
Demi-Marie Jun 12, 2019
bd3b1e2
`Duration` → `u128` in calculations
Demi-Marie Jun 13, 2019
9f5292a
`slot_duration` is in milleseconds, not seconds
Demi-Marie Jun 13, 2019
07e2974
Median algorithm: ignore blocks with slot_num < sl
Demi-Marie Jun 13, 2019
0e9d63b
Fix silly compile error
Demi-Marie Jun 13, 2019
e62baec
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 13, 2019
3766cd6
Store a duration, rather than an instant
Demi-Marie Jun 14, 2019
581ad8e
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 14, 2019
f4cf8a7
Fix compilation errors
Demi-Marie Jun 14, 2019
b9ccfbf
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 17, 2019
051b9f6
`INVERSE_NANO` → `NANOS_PER_SEC`
Demi-Marie Jun 17, 2019
e65e46a
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 19, 2019
18fe2d0
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 19, 2019
bf4ac48
Un-bump `authoring_version`
Demi-Marie Jun 19, 2019
7a4c8ec
Disable median algorithm when `median_required_blocks` is 0
Demi-Marie Jun 19, 2019
94680c7
Apply suggestions from code review
Demi-Marie Jun 19, 2019
71f0c30
Simplify panic
Demi-Marie Jun 19, 2019
d761493
Merge branch 'demi-relative-slots' of github.com:paritytech/substrate…
Demi-Marie Jun 19, 2019
c4a6315
Fix build error
Demi-Marie Jun 19, 2019
426dd04
Create `SignedDuration` struct
Demi-Marie Jun 20, 2019
c73aa1a
Merge branch 'master' into demi-relative-slots
Demi-Marie Jun 20, 2019
8f71428
Refactor median algorithm into separate function
Demi-Marie Jun 21, 2019
69eb154
Add issues for FIXMEs and respond to code review
Demi-Marie Jun 22, 2019
d43d04e
Fix minor warnings
Demi-Marie Jun 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
Update core/consensus/babe/src/lib.rs
`Aura` → `Babe`

Co-Authored-By: Pierre Krieger <[email protected]>
  • Loading branch information
Demi-Marie and tomaka authored Jun 7, 2019
commit c0ba761e2e488e8c7001f4c7833390a0027e2a30
2 changes: 1 addition & 1 deletion core/consensus/babe/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ fn claim_slot(
get_keypair(key).vrf_sign_n_check(transcript, |inout| check(inout, threshold))
}

/// Start an import queue for the Aura consensus algorithm.
/// Start an import queue for the Babe consensus algorithm.
pub fn import_queue<B, C, E>(
slot_duration: SlotDuration,
block_import: SharedBlockImport<B>,
Expand Down