LumeWeb
/
portal
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

refactor: switch to new libs5 kv db interface

This commit is contained in:
Derrick Hammer 2024-03-09 06:58:32 -05:00
parent 5e31dc2f02
commit 2bff5d2b9e
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
protocols/s5/s5.go
View File

@ -16,6 +16,7 @@ import (
"git.lumeweb.com/LumeWeb/portal/storage" "git.lumeweb.com/LumeWeb/portal/storage"
s5config "git.lumeweb.com/LumeWeb/libs5-go/config" s5config "git.lumeweb.com/LumeWeb/libs5-go/config"
s5db "git.lumeweb.com/LumeWeb/libs5-go/db"
s5ed "git.lumeweb.com/LumeWeb/libs5-go/ed25519" s5ed "git.lumeweb.com/LumeWeb/libs5-go/ed25519"
"git.lumeweb.com/LumeWeb/libs5-go/encoding" "git.lumeweb.com/LumeWeb/libs5-go/encoding"
s5fx "git.lumeweb.com/LumeWeb/libs5-go/fx" s5fx "git.lumeweb.com/LumeWeb/libs5-go/fx"
@ -23,7 +24,6 @@ import (
s5storage "git.lumeweb.com/LumeWeb/libs5-go/storage" s5storage "git.lumeweb.com/LumeWeb/libs5-go/storage"
"git.lumeweb.com/LumeWeb/libs5-go/types" "git.lumeweb.com/LumeWeb/libs5-go/types"
"git.lumeweb.com/LumeWeb/portal/protocols/registry" "git.lumeweb.com/LumeWeb/portal/protocols/registry"
bolt "go.etcd.io/bbolt"
"go.uber.org/fx" "go.uber.org/fx"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -60,7 +60,7 @@ type S5ProtocolResult struct {
Protocol registry.Protocol `group:"protocol"` Protocol registry.Protocol `group:"protocol"`
S5Protocol *S5Protocol S5Protocol *S5Protocol
S5NodeConfig *s5config.NodeConfig S5NodeConfig *s5config.NodeConfig
Db *bolt.DB Db s5db.KVStore
} }
type S5ProviderStoreParams struct { type S5ProviderStoreParams struct {
@ -144,12 +144,7 @@ func configureS5Protocol(proto *S5Protocol) (*s5config.NodeConfig, error) {
p := ed25519.NewKeyFromSeed(derivedSeed) p := ed25519.NewKeyFromSeed(derivedSeed)
cfg.KeyPair = s5ed.New(p) cfg.KeyPair = s5ed.New(p)
db, err := bolt.Open(cfg.DbPath, 0600, nil) cfg.DB = s5db.NewBboltDBKVStore(cfg.DbPath)
if err != nil {
proto.logger.Fatal("Failed to open db", zap.Error(err))
}
cfg.DB = db
cfg.Logger = proto.logger.Named("s5") cfg.Logger = proto.logger.Named("s5")