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.

Sign up for GitHub

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

Jump to bottom

Compatibility with go1.11: Fix vendoring and function calls to dedis/kyber library #71

Closed
wants to merge 2 commits into from
Closed

Compatibility with go1.11: Fix vendoring and function calls to dedis/kyber library #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa43662
Fix vendoring and call to dedis/kyber for compatibility with go1.11
gabbifish Oct 15, 2018
b6a0bf1
Fixed logging errors
gabbifish Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
131 changes: 101 additions & 30 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions core/drand.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (d *Drand) BeaconLoop() {
}
}
if catchup {
slog.Infof("drand: starting beacon loop in catch-up mode", err, b)
slog.Info("drand: starting beacon loop in catch-up mode", err, b)
} else {
slog.Infof("drand: starting beacon loop")
}
Expand Down Expand Up @@ -218,7 +218,7 @@ func (d *Drand) Private(c context.Context, priv *drand.PrivateRandRequest) (*dra
}
msg, err := ecies.Decrypt(key.G2, ecies.DefaultHash, d.priv.Key, priv.GetRequest())
if err != nil {
slog.Debugf("drand: received invalid ECIES private request:", err)
slog.Debug("drand: received invalid ECIES private request:", err)
return nil, errors.New("invalid ECIES request")
}

Expand Down
6 changes: 2 additions & 4 deletions dkg/dkg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
dkg_proto "github.com/dedis/drand/protobuf/dkg"
"github.com/dedis/kyber/share/dkg/pedersen"
"github.com/dedis/kyber/share/vss/pedersen"
"github.com/dedis/kyber/util/random"
"github.com/nikkolasg/slog"
"google.golang.org/grpc/peer"
)
Expand Down Expand Up @@ -66,8 +65,7 @@ func NewHandler(priv *key.Pair, conf *Config, n Network) (*Handler, error) {
if !ok {
return nil, errors.New("dkg: no nublic key corresponding in the given list")
}
randomSecret := conf.Suite.Scalar().Pick(random.New())
state, err := dkg.NewDistKeyGenerator(conf.Suite, priv.Key, points, t, randomSecret)
state, err := dkg.NewDistKeyGenerator(conf.Suite, priv.Key, points, t)
if err != nil {
return nil, fmt.Errorf("dkg: error using dkg library: %s", err)
}
Expand Down Expand Up @@ -181,7 +179,7 @@ func (h *Handler) processTmpResponses(deal *dkg.Deal) {
for _, r := range resps {
_, err := h.state.ProcessResponse(r)
if err != nil {
slog.Debugf("dkg: err process temp response: ", err)
slog.Debug("dkg: err process temp response:", err)
}
}
}
Expand Down
27 changes: 17 additions & 10 deletions vendor/github.com/BurntSushi/toml/COPYING
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.