chore: fix linter errors

Author: gijswijs

.golangci.yml

@@ -52,6 +52,11 @@ linters:
       # Checks the number of statements in a function.
       statements: 50
 
+    tagliatelle:
+      case:
+        rules:
+          json: snake
+
     wsl_v5:
       # We adopt a more relaxed cuddling rule by enabling
       # `allow-whole-block`. This allows a variable declaration to be

error.go

@@ -1,27 +1,24 @@
 package sphinx
 
-import (
-	"errors"
-	"fmt"
-)
+import "errors"
 
 var (
 	// ErrReplayedPacket is an error returned when a packet is rejected
 	// during processing due to being an attempted replay or probing
 	// attempt.
-	ErrReplayedPacket = fmt.Errorf("sphinx packet replay attempted")
+	ErrReplayedPacket = errors.New("sphinx packet replay attempted")
 
 	// ErrInvalidOnionVersion is returned during decoding of the onion
 	// packet, when the received packet has an unknown version byte.
-	ErrInvalidOnionVersion = fmt.Errorf("invalid onion packet version")
+	ErrInvalidOnionVersion = errors.New("invalid onion packet version")
 
-	// ErrInvalidOnionHMAC is returned during onion parsing process, when received
-	// mac does not corresponds to the generated one.
-	ErrInvalidOnionHMAC = fmt.Errorf("invalid mismatched mac")
+	// ErrInvalidOnionHMAC is returned during onion parsing process, when
+	// received mac does not corresponds to the generated one.
+	ErrInvalidOnionHMAC = errors.New("invalid mismatched mac")
 
 	// ErrInvalidOnionKey is returned during onion parsing process, when
 	// onion key is invalid.
-	ErrInvalidOnionKey = fmt.Errorf("invalid onion key: pubkey isn't on " +
+	ErrInvalidOnionKey = errors.New("invalid onion key: pubkey isn't on " +
 		"secp256k1 curve")
 
 	// ErrLogEntryNotFound is an error returned when a packet lookup in a

path_test.go

@@ -537,13 +537,11 @@ type decryptOnionMessageData struct {
 }
 
 type decryptHops struct {
-//nolint:tagliatelle
 	Onion        string `json:"onion"`
 	NodePrivKey  string `json:"node_privkey"`
 	NextBlinding string `json:"next_blinding"`
 }
 
-//nolint:tagliatelle
 type decryptOnionMessageHops struct {
 	OnionMessage string `json:"onion_message"`
 	PrivKey      string `json:"privkey"`
@@ -564,20 +562,17 @@ type onionMessageJsonTestCase struct {
 }
 
 type routeData struct {
-//nolint:tagliatelle
 	IntroductionNodeID string       `json:"introduction_node_id"`
 	Blinding           string       `json:"blinding"`
 	Hops               []blindedHop `json:"hops"`
 }
 
-//nolint:tagliatelle
 type routeOnionMessageData struct {
 	FirstNodeId  string                   `json:"first_node_id"`
 	FirstPathKey string                   `json:"first_path_key"`
 	Hops         []blindedOnionMessageHop `json:"hops"`
 }
 
-//nolint:tagliatelle
 type onionMessageData struct {
 	OnionMessagePacket string `json:"onion_message_packet"`
 }
@@ -590,15 +585,13 @@ type generateData struct {
 	Hops []hopData `json:"hops"`
 }
 
-//nolint:tagliatelle
 type generateOnionMessageData struct {
 	SessionKey string                `json:"session_key"`
 	Hops       []hopOnionMessageData `json:"hops"`
 }
 
 type unblindedHop struct {
 	NodePrivKey         string `json:"node_privkey"`
-//nolint:tagliatelle
 	EphemeralPubKey     string `json:"ephemeral_pubkey"`
 	DecryptedData       string `json:"decrypted_data"`
 	NextEphemeralPubKey string `json:"next_ephemeral_pubkey"`
@@ -610,31 +603,27 @@ type hopData struct {
 	EncodedTLVs string `json:"encoded_tlvs"`
 }
 
-//nolint:tagliatelle
 type hopOnionMessageData struct {
 	PathKeySecret           string                  `json:"path_key_secret"`
 	EncodedOnionMessageTLVs encodedOnionMessageTLVs `json:"tlvs"`
 	EncryptedDataTlv        string                  `json:"encrypted_data_tlv"` //nolint:lll
-	EphemeralPubKey         string                  `json:"E"`
+	EphemeralPubKey         string                  `json:"E"`                  //nolint:tagliatelle
 	NextEphemeralPrivKey    string                  `json:"next_e"`
 	EncryptedRecipientData  string                  `json:"encrypted_recipient_data"` //nolint:lll
 }
 
-//nolint:tagliatelle
 type encodedOnionMessageTLVs struct {
 	NextNodeID            string `json:"next_node_id"`
 	NextPathKeyOverride   string `json:"next_path_key_override"`
 	PathKeyOverrideSecret string `json:"path_key_override_secret"`
 	PathID                string `json:"path_id"`
 }
 
-//nolint:tagliatelle
 type blindedHop struct {
 	BlindedNodeID string `json:"blinded_node_id"`
 	EncryptedData string `json:"encrypted_data"`
 }
 
-//nolint:tagliatelle
 type blindedOnionMessageHop struct {
 	BlindedNodeID          string `json:"blinded_node_id"`
 	EncryptedRecipientData string `json:"encrypted_recipient_data"`

sphinx.go

@@ -225,7 +225,7 @@ func NewOnionPacket(paymentPath *PaymentPath, sessionKey *btcec.PrivateKey,
 	// exit early.
 	numHops := paymentPath.TrueRouteLength()
 	if numHops == 0 {
-		return nil, fmt.Errorf("route of length zero passed in")
+		return nil, ErrZeroHops
 	}
 
 	totalPayloadSize := paymentPath.TotalPayloadSize()
@@ -402,20 +402,23 @@ func generateHeaderPadding(key string, path *PaymentPath,
 func (f *OnionPacket) Encode(w io.Writer) error {
 	ephemeral := f.EphemeralKey.SerializeCompressed()
 
-	if _, err := w.Write([]byte{f.Version}); err != nil {
+	_, err := w.Write([]byte{f.Version})
+	if err != nil {
 		return err
 	}
 
-	if _, err := w.Write(ephemeral); err != nil {
+	_, err = w.Write(ephemeral)
+	if err != nil {
 		return err
 	}
 
-	_, err := w.Write(f.RoutingInfo)
+	_, err = w.Write(f.RoutingInfo)
 	if err != nil {
 		return err
 	}
 
-	if _, err := w.Write(f.HeaderMAC[:]); err != nil {
+	_, err = w.Write(f.HeaderMAC[:])
+	if err != nil {
 		return err
 	}
 

sphinx_test.go

@@ -98,12 +98,7 @@ func newTestRoute(numHops int) ([]*Router, *PaymentPath, *[]HopData, *OnionPacke
 
 	// Create numHops random sphinx nodes.
 	for i := 0; i < len(nodes); i++ {
-		privKey, err := btcec.NewPrivateKey()
-		if err != nil {
-			return nil, nil, nil, nil, fmt.Errorf("Unable to "+
-				"generate random key for sphinx node: %v", err)
-		}
-
+		privKey, _ := btcec.NewPrivateKey()
 		nodes[i] = NewRouter(
 			&PrivKeyECDH{PrivKey: privKey}, NewMemoryReplayLog(),
 		)