diff --git a/bolt/count.go b/bolt/count.go index 49e3c1f..ddb8525 100644 --- a/bolt/count.go +++ b/bolt/count.go @@ -6,9 +6,9 @@ import ( "encoding/binary" "log" - "github.com/boltdb/bolt" "github.com/nbd-wtf/go-nostr" nostr_binary "github.com/nbd-wtf/go-nostr/binary" + bolt "go.etcd.io/bbolt" ) func (b *BoltBackend) CountEvents(ctx context.Context, filter nostr.Filter) (int64, error) { diff --git a/bolt/delete.go b/bolt/delete.go index b0b0691..b44b9da 100644 --- a/bolt/delete.go +++ b/bolt/delete.go @@ -4,8 +4,8 @@ import ( "context" "encoding/hex" - "github.com/boltdb/bolt" "github.com/nbd-wtf/go-nostr" + bolt "go.etcd.io/bbolt" ) func (b *BoltBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/bolt/lib.go b/bolt/lib.go index 1e10ac1..d971a68 100644 --- a/bolt/lib.go +++ b/bolt/lib.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "time" - "github.com/boltdb/bolt" "github.com/fiatjaf/eventstore" + bolt "go.etcd.io/bbolt" ) const ( diff --git a/bolt/migration.go b/bolt/migration.go index c5c6dae..28efe72 100644 --- a/bolt/migration.go +++ b/bolt/migration.go @@ -3,7 +3,7 @@ package bolt import ( "encoding/binary" - "github.com/boltdb/bolt" + bolt "go.etcd.io/bbolt" ) const ( diff --git a/bolt/query.go b/bolt/query.go index 36c5367..e30985c 100644 --- a/bolt/query.go +++ b/bolt/query.go @@ -9,9 +9,9 @@ import ( "fmt" "log" - "github.com/boltdb/bolt" "github.com/nbd-wtf/go-nostr" nostr_binary "github.com/nbd-wtf/go-nostr/binary" + bolt "go.etcd.io/bbolt" ) type query struct { diff --git a/bolt/save.go b/bolt/save.go index 14fae0f..919f12f 100644 --- a/bolt/save.go +++ b/bolt/save.go @@ -6,10 +6,10 @@ import ( "encoding/hex" "fmt" - "github.com/boltdb/bolt" "github.com/fiatjaf/eventstore" "github.com/nbd-wtf/go-nostr" nostr_binary "github.com/nbd-wtf/go-nostr/binary" + bolt "go.etcd.io/bbolt" ) func (b *BoltBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error { diff --git a/go.mod b/go.mod index c9af97a..758159d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.21 require ( github.com/PowerDNS/lmdb-go v1.9.2 github.com/aquasecurity/esquery v0.2.0 - github.com/boltdb/bolt v1.3.1 github.com/dgraph-io/badger/v4 v4.2.0 github.com/elastic/go-elasticsearch/v8 v8.10.1 github.com/go-sql-driver/mysql v1.7.1 @@ -16,6 +15,7 @@ require ( github.com/nbd-wtf/go-nostr v0.28.5 github.com/stretchr/testify v1.8.4 github.com/urfave/cli/v3 v3.0.0-alpha7 + go.etcd.io/bbolt v1.3.9 golang.org/x/exp v0.0.0-20231006140011-7918f672742d ) diff --git a/go.sum b/go.sum index 73f69b2..ef2b903 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,6 @@ github.com/PowerDNS/lmdb-go v1.9.2 h1:Cmgerh9y3ZKBZGz1irxSShhfmFyRUh+Zdk4cZk7ZJv github.com/PowerDNS/lmdb-go v1.9.2/go.mod h1:TE0l+EZK8Z1B4dx070ZxkWTlp8RG1mjN0/+FkFRQMtU= github.com/aquasecurity/esquery v0.2.0 h1:9WWXve95TE8hbm3736WB7nS6Owl8UGDeu+0jiyE9ttA= github.com/aquasecurity/esquery v0.2.0/go.mod h1:VU+CIFR6C+H142HHZf9RUkp4Eedpo9UrEKeCQHWf9ao= -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM= @@ -147,6 +145,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= +go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -177,6 +177,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=