github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-08 23:18:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Miscellaneous code quality improvements (#7414)

Browse Source 
* anti-patterns

* performance issues

* handle skipped defer

* gazelle fix

* misc bug risks

* make logging of proposer slashings more robust

* simplify calling span.End()

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
Radosław Kapka
2020-10-04 17:03:10 +02:00
committed by GitHub
parent d9ae2073e2
commit 3e0b20529b
27 changed files with 98 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/enr-calculator/BUILD.bazel
View File

@@ -11,7 +11,6 @@ go_library(
visibility = ["//visibility:private"],
deps = [
"//shared/maxprocs:go_default_library",
"@com_github_btcsuite_btcd//btcec:go_default_library",
"@com_github_ethereum_go_ethereum//p2p/enode:go_default_library",
"@com_github_ethereum_go_ethereum//p2p/enr:go_default_library",
"@com_github_libp2p_go_libp2p_core//crypto:go_default_library",

5
tools/enr-calculator/main.go
View File

@@ -9,7 +9,6 @@ import (
"io/ioutil"
"net"
"github.com/btcsuite/btcd/btcec"
"github.com/ethereum/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/enr"
"github.com/libp2p/go-libp2p-core/crypto"
@@ -28,7 +27,7 @@ var (
func main() {
flag.Parse()
if len(*privateKey) == 0 {
if *privateKey == "" {
log.Fatal("No private key given")
}
dst, err := hex.DecodeString(*privateKey)
@@ -39,7 +38,7 @@ func main() {
if err != nil {
panic(err)
}
ecdsaPrivKey := (*ecdsa.PrivateKey)((*btcec.PrivateKey)(unmarshalledKey.(*crypto.Secp256k1PrivateKey)))
ecdsaPrivKey := (*ecdsa.PrivateKey)(unmarshalledKey.(*crypto.Secp256k1PrivateKey))
if net.ParseIP(*ipAddr).To4() == nil {
log.Fatalf("Invalid ipv4 address given: %v\n", err)

10
tools/eth1exporter/main.go
View File

@@ -132,10 +132,12 @@ func MetricsHTTP(w http.ResponseWriter, r *http.Request) {
total.Add(total, bal)
allOut = append(allOut, fmt.Sprintf("%veth_balance{name=\"%v\",address=\"%v\"} %v", *prefix, v.Name, v.Address, v.Balance))
}
allOut = append(allOut, fmt.Sprintf("%veth_balance_total %0.18f", *prefix, total))
allOut = append(allOut, fmt.Sprintf("%veth_load_seconds %0.2f", *prefix, loadSeconds))
allOut = append(allOut, fmt.Sprintf("%veth_loaded_addresses %v", *prefix, totalLoaded))
allOut = append(allOut, fmt.Sprintf("%veth_total_addresses %v", *prefix, len(allWatching)))
allOut = append(allOut,
fmt.Sprintf("%veth_balance_total %0.18f", *prefix, total),
fmt.Sprintf("%veth_load_seconds %0.2f", *prefix, loadSeconds),
fmt.Sprintf("%veth_loaded_addresses %v", *prefix, totalLoaded),
fmt.Sprintf("%veth_total_addresses %v", *prefix, len(allWatching)))
if _, err := fmt.Fprintln(w, strings.Join(allOut, "\n")); err != nil {
logrus.WithError(err).Error("Failed to write metrics")
}

7
tools/interop/convert-keys/main.go
View File

@@ -57,12 +57,15 @@ func main() {
if err != nil {
log.Fatalf("Failed to create file at %s: %v", os.Args[2], err)
}
defer func() {
cleanup := func() {
if err := outFile.Close(); err != nil {
panic(err)
}
}()
}
defer cleanup()
if err := keygen.SaveUnencryptedKeysToFile(outFile, out); err != nil {
// log.Fatalf will prevent defer from being called
cleanup()
log.Fatalf("Failed to save %v", err)
}
log.Printf("Wrote %s\n", os.Args[2])

5
tools/relaynode/relaynode.go
View File

@@ -41,10 +41,13 @@ func main() {
ctx := context.Background()
log.Start(ctx, "main")
defer log.Finish(ctx)
cleanup := func() { log.Finish(ctx) }
defer cleanup()
srcMAddr, err := multiaddr.NewMultiaddr(fmt.Sprintf("/ip4/0.0.0.0/tcp/%d", *port))
if err != nil {
// log.Fatalf will prevent defer from being called
cleanup()
log.Fatalf("Unable to construct multiaddr %v", err)
}

7
tools/unencrypted-keys-gen/main.go
View File

@@ -37,11 +37,12 @@ func main() {
if err != nil {
log.Fatal(err)
}
defer func() {
cleanup := func() {
if err := file.Close(); err != nil {
log.Fatal(err)
}
}()
}
defer cleanup()
var ctnr *keygen.UnencryptedKeysContainer
if *random {
@@ -50,6 +51,8 @@ func main() {
ctnr = generateUnencryptedKeys(*startIndex)
}
if err := keygen.SaveUnencryptedKeysToFile(file, ctnr); err != nil {
// log.Fatal will prevent defer from being called
cleanup()
log.Fatal(err)
}
}