Skip to content

Commit

Permalink
unsafe string/bytes conversion on nson.
Browse files Browse the repository at this point in the history
  • Loading branch information
fiatjaf committed Jul 30, 2023
1 parent 8bdbcc9 commit cfcd195
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 1 deletion.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/nbd-wtf/go-nostr

go 1.18
go 1.20

require (
github.com/btcsuite/btcd/btcec/v2 v2.2.0
Expand Down
10 changes: 10 additions & 0 deletions nson/nson.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"strconv"
"strings"
"unsafe"

"github.com/nbd-wtf/go-nostr"
)
Expand Down Expand Up @@ -44,6 +45,10 @@ const (

var NotNSON = fmt.Errorf("not nson")

func UnmarshalBytes(data []byte, evt *nostr.Event) (err error) {
return Unmarshal(unsafe.String(unsafe.SliceData(data), len(data)), evt)
}

// Unmarshal turns a NSON string into a nostr.Event struct
func Unmarshal(data string, evt *nostr.Event) (err error) {
defer func() {
Expand Down Expand Up @@ -105,6 +110,11 @@ func Unmarshal(data string, evt *nostr.Event) (err error) {
return err
}

func MarshalBytes(evt *nostr.Event) ([]byte, error) {
v, err := Marshal(evt)
return unsafe.Slice(unsafe.StringData(v), len(v)), err
}

func Marshal(evt *nostr.Event) (string, error) {
// start building the nson descriptors (without the first byte that represents the nson size)
nsonBuf := make([]byte, 256)
Expand Down
22 changes: 22 additions & 0 deletions nson/nson_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,25 @@ func BenchmarkNSONEncoding(b *testing.B) {
}
}
})

b.Run("nson.Marshal to bytes", func(b *testing.B) {
for i := 0; i < b.N; i++ {
for _, evt := range events {
MarshalBytes(evt)
}
}
})
}

func BenchmarkNSONDecoding(b *testing.B) {
events := make([]string, len(normalEvents))
eventsB := make([][]byte, len(normalEvents))
for i, jevt := range normalEvents {
evt := &nostr.Event{}
json.Unmarshal([]byte(jevt), evt)
nevt, _ := Marshal(evt)
events[i] = nevt
eventsB[i] = []byte(nevt)
}

b.Run("json.Unmarshal", func(b *testing.B) {
Expand All @@ -204,6 +214,18 @@ func BenchmarkNSONDecoding(b *testing.B) {
}
})

b.Run("nson.Unmarshal from bytes", func(b *testing.B) {
for i := 0; i < b.N; i++ {
for _, nevt := range eventsB {
evt := &nostr.Event{}
err := UnmarshalBytes(nevt, evt)
if err != nil {
b.Fatalf("failed to unmarshal: %s", err)
}
}
}
})

b.Run("json.Unmarshal + sig verification", func(b *testing.B) {
for i := 0; i < b.N; i++ {
for _, nevt := range events {
Expand Down

0 comments on commit cfcd195

Please sign in to comment.