Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi beacon support #846

Merged
merged 74 commits into from
Dec 7, 2021
Merged

Multi beacon support #846

merged 74 commits into from
Dec 7, 2021

Conversation

emmanuelm41
Copy link
Contributor

No description provided.

willscott and others added 30 commits October 5, 2020 07:51
# Conflicts:
#	core/broadcast.go
#	core/drand_beacon.go
#	core/drand_beacon_control.go
#	core/drand_daemon_interceptors.go
#	core/group_setup.go
#	core/util_test.go
#	protobuf/drand/control.pb.go
#	protobuf/drand/control.proto
Fix duplicated functions
core/drand_beacon.go Outdated Show resolved Hide resolved
core/drand_beacon.go Outdated Show resolved Hide resolved
core/drand_beacon.go Outdated Show resolved Hide resolved
core/drand_daemon.go Show resolved Hide resolved
core/drand_beacon.go Show resolved Hide resolved
# Conflicts:
#	core/drand.go
#	core/drand_beacon_control.go
#	core/drand_daemon_interceptors.go
#	core/group_setup.go
#	core/util_test.go
#	protobuf/drand/common.pb.go
#	protobuf/drand/common.proto
@nikkolasg nikkolasg marked this pull request as ready for review November 26, 2021 12:18
core/drand_beacon.go Outdated Show resolved Hide resolved
@nikkolasg
Copy link
Collaborator

Can you take a look at the tests ?

@willscott
Copy link
Member

This needs to be re-based against master to be merged

@raynaudoe
Copy link
Contributor

This needs to be re-based against master to be merged

Done

@willscott willscott merged commit 109200b into drand:master Dec 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants