fix tests in a bunch of places.

nip05/nip05_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"fiatjaf.com/nostr"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -50,7 +51,7 @@ func TestQuery(t *testing.T) {
 			assert.Error(t, err, "expected error for input: %s", test.input)
 		} else {
 			assert.NoError(t, err, "did not expect error for input: %s", test.input)
-			assert.Equal(t, test.expectedKey, pp.PublicKey, "for input: %s", test.input)
+			assert.Equal(t, nostr.MustPubKeyFromHex(test.expectedKey), pp.PublicKey, "for input: %s", test.input)
 		}
 	}
 }

nip19/nip19_test.go

@@ -27,7 +27,7 @@ func TestDecodeNpub(t *testing.T) {
 	prefix, pubkey, err := Decode("npub180cvv07tjdrrgpa0j7j7tmnyl2yr6yr7l8j4s3evf6u64th6gkwsyjh6w6")
 	assert.NoError(t, err)
 	assert.Equal(t, "npub", prefix, "returned invalid prefix")
-	assert.Equal(t, "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d", pubkey.(string), "returned wrong pubkey")
+	assert.Equal(t, nostr.MustPubKeyFromHex("3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"), pubkey.(nostr.PubKey), "returned wrong pubkey")
 }
 
 func TestFailDecodeBadChecksumNpub(t *testing.T) {
@@ -43,7 +43,7 @@ func TestDecodeNprofile(t *testing.T) {
 
 		pp, ok := data.(nostr.ProfilePointer)
 		assert.True(t, ok, "value returned of wrong type")
-		assert.Equal(t, "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d", pp.PublicKey)
+		assert.Equal(t, nostr.MustPubKeyFromHex("3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"), pp.PublicKey)
 		assert.Equal(t, 2, len(pp.Relays), "decoded wrong number of relays")
 
 		assert.Equal(t, "wss://r.x.com", pp.Relays[0], "decoded relay URLs wrongly")
@@ -57,7 +57,7 @@ func TestDecodeNprofile(t *testing.T) {
 
 		pp, ok := data.(nostr.ProfilePointer)
 		assert.True(t, ok, "value returned of wrong type")
-		assert.Equal(t, "e8b487c079b0f67c695ae6c4c2552a47f38adfa2533cc5926bd2c102942fdcb7", pp.PublicKey)
+		assert.Equal(t, nostr.MustPubKeyFromHex("e8b487c079b0f67c695ae6c4c2552a47f38adfa2533cc5926bd2c102942fdcb7"), pp.PublicKey)
 		assert.Equal(t, 3, len(pp.Relays), "decoded wrong number of relays")
 
 		assert.Equal(t, "wss://nostr-pub.wellorder.net", pp.Relays[0], "decoded relay URLs wrongly")
@@ -98,7 +98,7 @@ func TestEncodeDecodeNaddr(t *testing.T) {
 	assert.Equal(t, "naddr", prefix)
 
 	ep := data.(nostr.EntityPointer)
-	assert.Equal(t, "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d", ep.PublicKey)
+	assert.Equal(t, nostr.MustPubKeyFromHex("3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d"), ep.PublicKey)
 	assert.Equal(t, ep.Kind, nostr.KindArticle)
 	assert.Equal(t, "banana", ep.Identifier)
 
@@ -113,7 +113,7 @@ func TestDecodeNaddrWithoutRelays(t *testing.T) {
 
 	ep, ok := data.(nostr.EntityPointer)
 	assert.True(t, ok)
-	assert.Equal(t, "7fa56f5d6962ab1e3cd424e758c3002b8665f7b0d8dcee9fe9e288d7751ac194", ep.PublicKey)
+	assert.Equal(t, nostr.MustPubKeyFromHex("7fa56f5d6962ab1e3cd424e758c3002b8665f7b0d8dcee9fe9e288d7751ac194"), ep.PublicKey)
 	assert.Equal(t, nostr.KindArticle, ep.Kind)
 	assert.Equal(t, "references", ep.Identifier)
 	assert.Empty(t, ep.Relays)
@@ -137,8 +137,8 @@ func TestEncodeDecodeNEvent(t *testing.T) {
 	ep, ok := res.(nostr.EventPointer)
 	assert.True(t, ok)
 
-	assert.Equal(t, "7fa56f5d6962ab1e3cd424e758c3002b8665f7b0d8dcee9fe9e288d7751abb88", ep.Author)
+	assert.Equal(t, nostr.MustPubKeyFromHex("7fa56f5d6962ab1e3cd424e758c3002b8665f7b0d8dcee9fe9e288d7751abb88"), ep.Author)
-	assert.Equal(t, "45326f5d6962ab1e3cd424e758c3002b8665f7b0d8dcee9fe9e288d7751ac194", ep.ID)
+	assert.Equal(t, nostr.MustIDFromHex("45326f5d6962ab1e3cd424e758c3002b8665f7b0d8dcee9fe9e288d7751ac194"), ep.ID)
 	assert.Equal(t, 1, len(ep.Relays), "wrong number of relays")
 	assert.Equal(t, "wss://banana.com", ep.Relays[0])
 }

nip29/nip29_test.go

@@ -21,7 +21,14 @@ func TestGroupEventBackAndForth(t *testing.T) {
 
 	require.Equal(t, "xyz", meta1.Tags.GetD(), "translation of group1 to metadata event failed: %s", meta1)
 	require.NotNil(t, meta1.Tags.FindWithValue("name", "banana"), "translation of group1 to metadata event failed: %s", meta1)
-	require.NotNil(t, meta1.Tags.Find("private"), "translation of group1 to metadata event failed: %s", meta1)
+
+	hasPrivate := false
+	for _, tag := range meta1.Tags {
+		if len(tag) == 1 && tag[0] == "private" {
+			hasPrivate = true
+		}
+	}
+	require.True(t, hasPrivate, "translation of group1 to metadata event failed: %s", meta1)
 
 	group2, _ := NewGroup("groups.com'abc")
 	group2.Members[ALICE] = []*Role{{Name: "nada"}}

nip44/nip44.go

@@ -158,7 +158,7 @@ func GenerateConversationKey(pub nostr.PubKey, sk nostr.SecretKey) ([32]byte, er
 	var ck [32]byte
 
 	if bytes.Compare(sk[:], maxThreshold) != -1 || sk == [32]byte{} {
-		return ck, fmt.Errorf("invalid private key: x coordinate %x is not on the secp256k1 curve", sk)
+		return ck, fmt.Errorf("invalid private key: x coordinate %x is not on the secp256k1 curve", sk[:])
 	}
 
 	shared, err := computeSharedSecret(pub, sk)

nip49/nip49_test.go

@@ -14,7 +14,7 @@ func TestDecryptKeyFromNIPText(t *testing.T) {
 	ncrypt := "ncryptsec1qgg9947rlpvqu76pj5ecreduf9jxhselq2nae2kghhvd5g7dgjtcxfqtd67p9m0w57lspw8gsq6yphnm8623nsl8xn9j4jdzz84zm3frztj3z7s35vpzmqf6ksu8r89qk5z2zxfmu5gv8th8wclt0h4p"
 	secretKey, err := Decrypt(ncrypt, "nostr")
 	assert.NoError(t, err)
-	assert.Equal(t, "3501454135014541350145413501453fefb02227e449e57cf4d3a3ce05378683", secretKey)
+	assert.Equal(t, nostr.MustSecretKeyFromHex("3501454135014541350145413501453fefb02227e449e57cf4d3a3ce05378683"), secretKey)
 }
 
 func TestEncryptAndDecrypt(t *testing.T) {
@@ -44,7 +44,7 @@ func TestEncryptAndDecrypt(t *testing.T) {
 
 		secretKey, err := Decrypt(bech32code, f.password)
 		assert.NoError(t, err)
-		assert.Equal(t, f.secretkey, secretKey)
+		assert.Equal(t, sk, secretKey)
 	}
 }