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

feat: Make voter electing staisfy finality #124

Merged
merged 14 commits into from
Oct 13, 2020
Merged

feat: Make voter electing staisfy finality #124

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bd6517e
feat: add an option for selecting priv key type
Oct 6, 2020
45c1ca9
fix: test cases
Oct 6, 2020
76a2569
fix: fmt error
Oct 6, 2020
6f5e4f7
fix: golang ci error
Oct 6, 2020
61f4321
fix: apply priv-key-type option to testnet command
Oct 7, 2020
ca35310
fix: bls compile problem
Oct 7, 2020
a5e6801
fix: contract-tests failure
Oct 7, 2020
dcc16b7
fix: modify change log pending
Oct 7, 2020
71b3931
feat: Make voting satisfy finality
Sep 15, 2020
8c1e48e
fix: Make voter sorting working well
Sep 22, 2020
e6e911a
Move sampling logic to types package
Sep 29, 2020
b86d943
Change the voter that don't use winpoint to validator
Oct 5, 2020
4161f5a
Change condition to sort voters
Oct 6, 2020
b1348de
fix: Fix error during test run
Oct 8, 2020
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: golang ci error
  • Loading branch information
Woosang Son committed Oct 6, 2020
commit 6f5e4f71933b4577fd1f93d43a10e5c2ad4499b5
7 changes: 4 additions & 3 deletions privval/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,12 @@ type FilePV struct {
// and sets the filePaths, but does not call Save().
func GenFilePV(keyFilePath, stateFilePath, privKeyType string) (filePV *FilePV, err error) {
var privKey crypto.PrivKey
if strings.EqualFold(privKeyType, PrevKeyTypeEd25519) {
switch strings.ToLower(privKeyType) {
case PrevKeyTypeEd25519:
privKey = ed25519.GenPrivKey()
} else if strings.EqualFold(privKeyType, PrevKeyTypeComposite) {
case PrevKeyTypeComposite:
privKey = composite.NewPrivKeyComposite(bls.GenPrivKey(), ed25519.GenPrivKey())
} else {
default:
return nil, fmt.Errorf("undefined private key type: %s", privKeyType)
}

Expand Down