a big bundle of conversions and other changes.

eventstore/badger/save.go

@@ -1,18 +1,16 @@
 package badger
 
 import (
-	"context"
-	"encoding/hex"
 	"fmt"
 	"math"
 
-	"github.com/dgraph-io/badger/v4"
-	"fiatjaf.com/nostr/eventstore"
-	bin "fiatjaf.com/nostr/eventstore/internal/binary"
 	"fiatjaf.com/nostr"
+	"fiatjaf.com/nostr/eventstore"
+	"fiatjaf.com/nostr/eventstore/codec/betterbinary"
+	"github.com/dgraph-io/badger/v4"
 )
 
-func (b *BadgerBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error {
+func (b *BadgerBackend) SaveEvent(evt nostr.Event) error {
 	// sanity checking
 	if evt.CreatedAt > math.MaxUint32 || evt.Kind > math.MaxUint16 {
 		return fmt.Errorf("event with values out of expected boundaries")
@@ -20,10 +18,9 @@ func (b *BadgerBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error {
 
 	return b.Update(func(txn *badger.Txn) error {
 		// query event by id to ensure we don't save duplicates
-		id, _ := hex.DecodeString(evt.ID)
 		prefix := make([]byte, 1+8)
 		prefix[0] = indexIdPrefix
-		copy(prefix[1:], id)
+		copy(prefix[1:], evt.ID[0:8])
 		it := txn.NewIterator(badger.IteratorOptions{})
 		defer it.Close()
 		it.Seek(prefix)
@@ -36,16 +33,16 @@ func (b *BadgerBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error {
 	})
 }
 
-func (b *BadgerBackend) save(txn *badger.Txn, evt *nostr.Event) error {
+func (b *BadgerBackend) save(txn *badger.Txn, evt nostr.Event) error {
 	// encode to binary
-	bin, err := bin.Marshal(evt)
-	if err != nil {
+	buf := make([]byte, betterbinary.Measure(evt))
+	if err := betterbinary.Marshal(evt, buf); err != nil {
 		return err
 	}
 
 	idx := b.Serial()
 	// raw event store
-	if err := txn.Set(idx, bin); err != nil {
+	if err := txn.Set(idx, buf); err != nil {
 		return err
 	}