Skip to content

Reduce "Created new rootkey/partkey" verbosity #629

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

Merged
tsachiherman merged 1 commit into from
Dec 13, 2019
Merged

Reduce "Created new rootkey/partkey" verbosity #629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions gen/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ func generateGenesisFiles(outDir string, proto protocol.ConsensusVersion, netNam
sort.SliceStable(allocation, func(i, j int) bool {
return allocation[i].Name < allocation[j].Name
})
rootKeyCreated := 0
partKeyCreated := 0

for _, wallet := range allocation {
var root account.Root
Expand Down Expand Up @@ -152,7 +154,10 @@ func generateGenesisFiles(outDir string, proto protocol.ConsensusVersion, netNam
os.Remove(wfilename)
return
}
fmt.Printf("Created new rootkey: %s\n", wfilename)
if verbose {
fmt.Printf("Created new rootkey: %s\n", wfilename)
}
rootKeyCreated++
}

if partkeyErr != nil && wallet.Online == basics.Online {
Expand All @@ -171,7 +176,10 @@ func generateGenesisFiles(outDir string, proto protocol.ConsensusVersion, netNam
os.Remove(pfilename)
return
}
fmt.Printf("Created new partkey: %s\n", pfilename)
if verbose {
fmt.Printf("Created new partkey: %s\n", pfilename)
}
partKeyCreated++
}
}

Expand Down Expand Up @@ -250,6 +258,11 @@ func generateGenesisFiles(outDir string, proto protocol.ConsensusVersion, netNam

jsonData := protocol.EncodeJSON(g)
err = ioutil.WriteFile(filepath.Join(outDir, config.GenesisJSONFile), append(jsonData, '\n'), 0666)

if (!verbose) && (rootKeyCreated > 0 || partKeyCreated > 0) {
fmt.Printf("Created %d new rootkeys and %d new partkeys.\n", rootKeyCreated, partKeyCreated)
}

return
}

Expand Down