coracle/nostrlib
2
1
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

constant ints must be casted so they work with gomobile.

Browse Source
This commit is contained in:
fiatjaf
2026-03-29 09:15:22 -03:00
parent d4940c7858
commit 56610a32e6
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eventstore/codec/betterbinary/codec.go
+6 -6
View File
@@ -40,12 +40,12 @@ func Marshal(evt nostr.Event, buf []byte) error {
buf[0] = 0 buf[0] = 0
if evt.Kind > MaxKind { if evt.Kind > MaxKind {
return fmt.Errorf("kind is too big: %d, max is %d", evt.Kind, MaxKind) return fmt.Errorf("kind is too big: %d, max is %d", evt.Kind, uint16(MaxKind))
} }
binary.LittleEndian.PutUint16(buf[1:3], uint16(evt.Kind)) binary.LittleEndian.PutUint16(buf[1:3], uint16(evt.Kind))
if evt.CreatedAt > MaxCreatedAt { if evt.CreatedAt > MaxCreatedAt {
return fmt.Errorf("created_at is too big: %d, max is %d", evt.CreatedAt, MaxCreatedAt) return fmt.Errorf("created_at is too big: %d, max is %d", evt.CreatedAt, uint32(MaxCreatedAt))
} }
binary.LittleEndian.PutUint32(buf[3:7], uint32(evt.CreatedAt)) binary.LittleEndian.PutUint32(buf[3:7], uint32(evt.CreatedAt))
@@ -58,7 +58,7 @@ func Marshal(evt nostr.Event, buf []byte) error {
ntags := len(evt.Tags) ntags := len(evt.Tags)
if ntags > MaxTagCount { if ntags > MaxTagCount {
return fmt.Errorf("can't encode too many tags: %d, max is %d", ntags, MaxTagCount) return fmt.Errorf("can't encode too many tags: %d, max is %d", ntags, uint16(MaxTagCount))
} }
binary.LittleEndian.PutUint16(buf[137:139], uint16(ntags)) binary.LittleEndian.PutUint16(buf[137:139], uint16(ntags))
@@ -68,7 +68,7 @@ func Marshal(evt nostr.Event, buf []byte) error {
itemCount := len(tag) itemCount := len(tag)
if itemCount > MaxTagItemCount { if itemCount > MaxTagItemCount {
return fmt.Errorf("can't encode a tag with so many items: %d, max is %d", itemCount, MaxTagItemCount) return fmt.Errorf("can't encode a tag with so many items: %d, max is %d", itemCount, uint8(MaxTagItemCount))
} }
buf[tagBase+tagOffset] = uint8(itemCount) buf[tagBase+tagOffset] = uint8(itemCount)
@@ -76,7 +76,7 @@ func Marshal(evt nostr.Event, buf []byte) error {
for _, item := range tag { for _, item := range tag {
itemSize := len(item) itemSize := len(item)
if itemSize > MaxTagItemSize { if itemSize > MaxTagItemSize {
return fmt.Errorf("tag item is too large: %d, max is %d", itemSize, MaxTagItemSize) return fmt.Errorf("tag item is too large: %d, max is %d", itemSize, uint16(MaxTagItemSize))
} }
binary.LittleEndian.PutUint16(buf[tagBase+tagOffset+itemOffset:], uint16(itemSize)) binary.LittleEndian.PutUint16(buf[tagBase+tagOffset+itemOffset:], uint16(itemSize))
@@ -91,7 +91,7 @@ func Marshal(evt nostr.Event, buf []byte) error {
// content // content
if contentLength := len(evt.Content); contentLength > MaxContentSize { if contentLength := len(evt.Content); contentLength > MaxContentSize {
return fmt.Errorf("content is too large: %d, max is %d", contentLength, MaxContentSize) return fmt.Errorf("content is too large: %d, max is %d", contentLength, uint16(MaxContentSize))
} else { } else {
binary.LittleEndian.PutUint16(buf[tagBase+tagsSectionLength:], uint16(contentLength)) binary.LittleEndian.PutUint16(buf[tagBase+tagsSectionLength:], uint16(contentLength))
} }
eventstore/mmm/mmmm.go
+3 -2
View File
@@ -4,6 +4,7 @@ import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt" "fmt"
"math"
"os" "os"
"path/filepath" "path/filepath"
"slices" "slices"
@@ -50,7 +51,7 @@ func (b *MultiMmapManager) String() string {
} }
const ( const (
MMAP_INFINITE_SIZE = 1 << 40 MMAP_INFINITE_SIZE = math.MaxInt
maxuint16 = 65535 maxuint16 = 65535
maxuint32 = 4294967295 maxuint32 = 4294967295
) )
@@ -84,7 +85,7 @@ func (b *MultiMmapManager) Init() error {
if err != nil { if err != nil {
return fmt.Errorf("failed to open events file at %s: %w", b.mmapfPath, err) return fmt.Errorf("failed to open events file at %s: %w", b.mmapfPath, err)
} }
mmapf, err := syscall.Mmap(int(file.Fd()), 0, MMAP_INFINITE_SIZE, mmapf, err := syscall.Mmap(int(file.Fd()), 0, int(MMAP_INFINITE_SIZE),
syscall.PROT_READ|syscall.PROT_WRITE, syscall.MAP_SHARED) syscall.PROT_READ|syscall.PROT_WRITE, syscall.MAP_SHARED)
if err != nil { if err != nil {
return fmt.Errorf("failed to mmap events file at %s: %w", b.mmapfPath, err) return fmt.Errorf("failed to mmap events file at %s: %w", b.mmapfPath, err)