Address comments

Author: AlCutter

note/note.go

@@ -43,10 +43,10 @@ var (
 // - 0x04 ed25519 Cosignature/V1
 // - 0x06 ML-DSA-44 Cosignature/V1
 func NewSigner(skey string) (Signer, error) {
-	priv1, skey, _ := strings.Cut(skey, "+")
-	priv2, skey, _ := strings.Cut(skey, "+")
-	name, skey, _ := strings.Cut(skey, "+")
-	hash16, key64, _ := strings.Cut(skey, "+")
+	priv1, k, _ := strings.Cut(skey, "+")
+	priv2, k, _ := strings.Cut(k, "+")
+	name, k, _ := strings.Cut(k, "+")
+	hash16, key64, _ := strings.Cut(k, "+")
 	key, err := base64.StdEncoding.DecodeString(key64)
 	if priv1 != "PRIVATE" || priv2 != "KEY" || len(hash16) != 8 || err != nil || !isValidName(name) || len(key) == 0 {
 		return nil, errSignerID

note/note_test.go

@@ -10,6 +10,53 @@ import (
 	"golang.org/x/mod/sumdb/note"
 )
 
+func TestSignerVerifier(t *testing.T) {
+	ns, nv, err := note.GenerateKey(nil, "note")
+	if err != nil {
+		t.Fatalf("note.GenerateKey: %v", err)
+	}
+	ms, mv, err := GenerateMLDSAKey("mldsa")
+	if err != nil {
+		t.Fatalf("GenerateMLDSAKey: %v", err)
+	}
+
+	for _, test := range []struct {
+		name string
+		s string
+		v string
+	} {
+		{name: "note", s: ns, v: nv},
+		{name: "mldsa", s: ms, v: mv},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			ns, err := NewSigner(test.s)
+			if err != nil {
+				t.Fatalf("NewSigner: %v", err)
+			}
+			nv, err := NewVerifier(test.v)
+			if err != nil {
+				t.Fatalf("NewVerifier: %v", err)
+			}
+			checkRoundTrip(t, fmt.Sprintf("%s\n0\nblah\n", test.name), ns, nv)
+		})
+	}
+}
+
+func checkRoundTrip(t *testing.T, msg string, s note.Signer, v note.Verifier) {
+	t.Helper()
+	signed, err := note.Sign(&note.Note{Text: msg}, s)
+	if err != nil {
+		t.Errorf("%s failed to sign: %v", msg, err)
+	}
+	n, err := note.Open(signed, note.VerifierList(v))
+	if err != nil {
+		t.Errorf("%s failed to open: %v", msg, err)
+	}
+	if n.Text != msg {
+		t.Errorf("got %q want %q", n.Text, msg)
+	}
+}
+
 func TestNoteInterop(t *testing.T) {
 	sk, vk, err := note.GenerateKey(nil, "example")
 	if err != nil {
@@ -37,21 +84,7 @@ func TestNoteInterop(t *testing.T) {
 	for i, s := range []note.Signer{sf, sn} {
 		for j, v := range []note.Verifier{vf, vn} {
 			msg := fmt.Sprintf("%d, %d\n", i, j)
-			signed, err := note.Sign(&note.Note{Text: msg}, s)
-			if err != nil {
-				t.Errorf("%s failed to sign: %v", msg, err)
-				continue
-			}
-
-			n, err := note.Open(signed, note.VerifierList(v))
-			if err != nil {
-				t.Errorf("%s failed to open: %v", msg, err)
-				continue
-			}
-
-			if n.Text != msg {
-				t.Errorf("got %q want %q", n.Text, msg)
-			}
+			checkRoundTrip(t, msg, s, v)
 		}
 	}
 }