chore: fix linter errors

Author: gijswijs

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

@@ -521,6 +521,7 @@ type onionBlindingJsonTestCase struct {
 	Decrypt  decryptData       `json:"decrypt"`
 }
 
+//nolint:tagliatelle
 type generateOnionData struct {
 	SessionKey string `json:"session_key"`
 	AssocData  string `json:"associated_data"`
@@ -535,8 +536,8 @@ type decryptOnionMessageData struct {
 	Hops []decryptOnionMessageHops `json:"hops"`
 }
 
-type decryptHops struct {
 //nolint:tagliatelle
+type decryptHops struct {
 	Onion        string `json:"onion"`
 	NodePrivKey  string `json:"node_privkey"`
 	NextBlinding string `json:"next_blinding"`
@@ -562,8 +563,8 @@ type onionMessageJsonTestCase struct {
 	Decrypt      decryptOnionMessageData  `json:"decrypt"`
 }
 
-type routeData struct {
 //nolint:tagliatelle
+type routeData struct {
 	IntroductionNodeID string       `json:"introduction_node_id"`
 	Blinding           string       `json:"blinding"`
 	Hops               []blindedHop `json:"hops"`
@@ -595,14 +596,15 @@ type generateOnionMessageData struct {
 	Hops       []hopOnionMessageData `json:"hops"`
 }
 
+//nolint:tagliatelle
 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"`
 }
 
+//nolint:tagliatelle
 type hopData struct {
 	SessionKey  string `json:"session_key"`
 	NodeID      string `json:"node_id"`

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,11 +402,13 @@ 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
 	}
 
@@ -415,7 +417,8 @@ func (f *OnionPacket) Encode(w io.Writer) error {
 		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(),
 		)