nson: test encoder with events from the wild.

nbd-wtf · Jul 5, 2023 · 7ba3844 · 7ba3844
1 parent 6f03e6b
commit 7ba3844
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 33 deletions.
diff --git a/nson/nson.go b/nson/nson.go
@@ -45,7 +45,7 @@ const (
 var NotNSON = fmt.Errorf("not nson")
 
 // Unmarshal turns a NSON string into a nostr.Event struct
-func Unmarshal(data string) (evt *nostr.Event, err error) {
+func Unmarshal(data string, evt *nostr.Event) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			err = fmt.Errorf("failed to decode nson: %v", r)
@@ -54,14 +54,12 @@ func Unmarshal(data string) (evt *nostr.Event, err error) {
 
 	// check if it's nson
 	if data[NSON_MARKER_START:NSON_MARKER_END] != ",\"nson\":" {
-		return nil, NotNSON
+		return NotNSON
 	}
 
 	// nson values
 	nsonSize, nsonDescriptors := parseDescriptors(data)
 
-	evt = &nostr.Event{}
-
 	// static fields
 	evt.ID = data[ID_START:ID_END]
 	evt.PubKey = data[PUBKEY_START:PUBKEY_END]
@@ -104,7 +102,7 @@ func Unmarshal(data string) (evt *nostr.Event, err error) {
 		evt.Tags[t] = tag
 	}
 
-	return evt, err
+	return err
 }
 
 func Marshal(evt nostr.Event) (string, error) {