LumeWeb
/
libs5-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: switch GetCachedStorageLocations to use types.StorageLocationType

This commit is contained in:
Derrick Hammer 2024-01-09 06:53:09 -05:00
parent f0a1bf45c8
commit 45ffa1a98a
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
interfaces/node.go
View File

@ -4,6 +4,7 @@ import (
"git.lumeweb.com/LumeWeb/libs5-go/config" "git.lumeweb.com/LumeWeb/libs5-go/config"
"git.lumeweb.com/LumeWeb/libs5-go/encoding" "git.lumeweb.com/LumeWeb/libs5-go/encoding"
"git.lumeweb.com/LumeWeb/libs5-go/structs" "git.lumeweb.com/LumeWeb/libs5-go/structs"
"git.lumeweb.com/LumeWeb/libs5-go/types"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -18,7 +19,7 @@ type Node interface {
Logger() *zap.Logger Logger() *zap.Logger
Db() *bolt.DB Db() *bolt.DB
Start() error Start() error
GetCachedStorageLocations(hash *encoding.Multihash, types []int) (map[string]StorageLocation, error) GetCachedStorageLocations(hash *encoding.Multihash, kinds []types.StorageLocationType) (map[string]StorageLocation, error)
AddStorageLocation(hash *encoding.Multihash, nodeId *encoding.NodeId, location StorageLocation, message []byte, config *config.NodeConfig) error AddStorageLocation(hash *encoding.Multihash, nodeId *encoding.NodeId, location StorageLocation, message []byte, config *config.NodeConfig) error
NetworkId() string NetworkId() string
} }

9
node/node.go
View File

@ -7,6 +7,7 @@ import (
"git.lumeweb.com/LumeWeb/libs5-go/service" "git.lumeweb.com/LumeWeb/libs5-go/service"
"git.lumeweb.com/LumeWeb/libs5-go/storage" "git.lumeweb.com/LumeWeb/libs5-go/storage"
"git.lumeweb.com/LumeWeb/libs5-go/structs" "git.lumeweb.com/LumeWeb/libs5-go/structs"
"git.lumeweb.com/LumeWeb/libs5-go/types"
"git.lumeweb.com/LumeWeb/libs5-go/utils" "git.lumeweb.com/LumeWeb/libs5-go/utils"
"github.com/vmihailenco/msgpack/v5" "github.com/vmihailenco/msgpack/v5"
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
@ -116,7 +117,7 @@ func (n *NodeImpl) Start() error {
return nil return nil
} }
*/ */
func (n *NodeImpl) GetCachedStorageLocations(hash *encoding.Multihash, types []int) (map[string]interfaces.StorageLocation, error) { func (n *NodeImpl) GetCachedStorageLocations(hash *encoding.Multihash, kinds []types.StorageLocationType) (map[string]interfaces.StorageLocation, error) {
locations := make(map[string]interfaces.StorageLocation) locations := make(map[string]interfaces.StorageLocation)
locationMap, err := n.readStorageLocationsFromDB(hash) locationMap, err := n.readStorageLocationsFromDB(hash)
@ -129,9 +130,9 @@ func (n *NodeImpl) GetCachedStorageLocations(hash *encoding.Multihash, types []i
ts := time.Now().Unix() ts := time.Now().Unix()
for _, t := range types { for _, t := range kinds {
nodeMap, ok := (locationMap)[t] nodeMap, ok := (locationMap)[int(t)]
if !ok { if !ok {
continue continue
} }
@ -151,7 +152,7 @@ func (n *NodeImpl) GetCachedStorageLocations(hash *encoding.Multihash, types []i
continue continue
} }
storageLocation := storage.NewStorageLocation(t, addresses, expiry) storageLocation := storage.NewStorageLocation(int(t), addresses, expiry)
if len(value) > 4 { if len(value) > 4 {
if providerMessage, ok := value[4].([]byte); ok { if providerMessage, ok := value[4].([]byte); ok {
(storageLocation).SetProviderMessage(providerMessage) (storageLocation).SetProviderMessage(providerMessage)