Linter

Author: connorwstein

keystore/kms/asn1.go

@@ -71,11 +71,10 @@ func ASN1ToSEC1PublicKey(asn1PublicKey []byte) ([]byte, error) {
 	if len(pubKeyBytes) == 64 {
 		// BitString is 64 bytes (X || Y), prepend 0x04
 		pubKeyBytes = append([]byte{0x04}, pubKeyBytes...)
-	} else if len(pubKeyBytes) == 65 && pubKeyBytes[0] == 0x04 {
-		// BitString already has 0x04 prefix (KMS format), use as-is
-	} else {
+	} else if len(pubKeyBytes) != 65 || pubKeyBytes[0] != 0x04 {
 		return nil, fmt.Errorf("invalid public key length in BitString: expected 64 or 65 bytes, got %d", len(pubKeyBytes))
 	}
+	// BitString already has 0x04 prefix (KMS format), use as-is
 
 	pubKey, err := crypto.UnmarshalPubkey(pubKeyBytes)
 	if err != nil {

keystore/kms/asn1_test.go

@@ -4,8 +4,9 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/crypto"
-	kms "github.com/smartcontractkit/chainlink-common/keystore/kms"
 	"github.com/stretchr/testify/require"
+
+	kms "github.com/smartcontractkit/chainlink-common/keystore/kms"
 )
 
 func TestSEC1ToASN1PublicKey(t *testing.T) {
@@ -26,8 +27,9 @@ func TestSEC1ToASN1PublicKey(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, sec1PubKey2, 65)
 	require.Equal(t, byte(0x04), sec1PubKey2[0])
-	require.Equal(t, privateKey.PublicKey.X.Bytes(), sec1PubKey2[1:33])
-	require.Equal(t, privateKey.PublicKey.Y.Bytes(), sec1PubKey2[33:65])
+	pubKey := privateKey.PublicKey
+	require.Equal(t, pubKey.X.Bytes(), sec1PubKey2[1:33])
+	require.Equal(t, pubKey.Y.Bytes(), sec1PubKey2[33:65])
 }
 
 func TestASN1SignatureToSEC1Signature(t *testing.T) {

keystore/kms/keystore.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	kmslib "github.com/aws/aws-sdk-go/service/kms"
+
 	"github.com/smartcontractkit/chainlink-common/keystore"
 )
 
@@ -146,7 +147,6 @@ func (k *keystoreSignerReader) Sign(ctx context.Context, req keystore.SignReques
 	default:
 		return keystore.SignResponse{}, fmt.Errorf("key %s: %w", req.KeyName, keystore.ErrInvalidSignRequest)
 	}
-
 }
 
 func (k *keystoreSignerReader) Verify(ctx context.Context, req keystore.VerifyRequest) (keystore.VerifyResponse, error) {

keystore/kms/keystore_test.go

@@ -4,9 +4,10 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/stretchr/testify/require"
+
 	"github.com/smartcontractkit/chainlink-common/keystore"
 	kms "github.com/smartcontractkit/chainlink-common/keystore/kms"
-	"github.com/stretchr/testify/require"
 )
 
 func TestKMSKeystore(t *testing.T) {