Networks/Reticulum-Go
2
1
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects 1 Releases 1 Wiki Activity

refactor: update Identity methods to use common package for Msgpack serialization

Browse Source
This commit is contained in:
ivan
2026-01-01 00:59:20 -06:00
parent cdc512c391
commit 07dc008a31
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/identity/identity.go
View File

@@ -20,7 +20,6 @@ import (
"git.quad4.io/Networks/Reticulum-Go/pkg/common" "git.quad4.io/Networks/Reticulum-Go/pkg/common"
"git.quad4.io/Networks/Reticulum-Go/pkg/cryptography" "git.quad4.io/Networks/Reticulum-Go/pkg/cryptography"
"git.quad4.io/Networks/Reticulum-Go/pkg/debug" "git.quad4.io/Networks/Reticulum-Go/pkg/debug"
"github.com/vmihailenco/msgpack/v5"
"golang.org/x/crypto/curve25519" "golang.org/x/crypto/curve25519"
"golang.org/x/crypto/hkdf" "golang.org/x/crypto/hkdf"
) )
@@ -672,7 +671,7 @@ func (i *Identity) saveRatchets(path string) error {
} }
// Pack ratchets using msgpack // Pack ratchets using msgpack
packedRatchets, err := msgpack.Marshal(ratchetList) packedRatchets, err := common.MsgpackMarshal(ratchetList)
if err != nil { if err != nil {
return fmt.Errorf("failed to pack ratchets: %w", err) return fmt.Errorf("failed to pack ratchets: %w", err)
} }
@@ -687,7 +686,7 @@ func (i *Identity) saveRatchets(path string) error {
} }
// Pack the entire structure // Pack the entire structure
finalData, err := msgpack.Marshal(persistedData) finalData, err := common.MsgpackMarshal(persistedData)
if err != nil { if err != nil {
return fmt.Errorf("failed to pack ratchet data: %w", err) return fmt.Errorf("failed to pack ratchet data: %w", err)
} }
@@ -800,7 +799,7 @@ func (i *Identity) loadRatchets(path string) error {
// Unpack outer structure: {"signature": ..., "ratchets": ...} // Unpack outer structure: {"signature": ..., "ratchets": ...}
var persistedData map[string][]byte var persistedData map[string][]byte
if err := msgpack.Unmarshal(fileData, &persistedData); err != nil { if err := common.MsgpackUnmarshal(fileData, &persistedData); err != nil {
return fmt.Errorf("failed to unpack ratchet data: %w", err) return fmt.Errorf("failed to unpack ratchet data: %w", err)
} }
@@ -818,7 +817,7 @@ func (i *Identity) loadRatchets(path string) error {
// Unpack ratchet list // Unpack ratchet list
var ratchetList [][]byte var ratchetList [][]byte
if err := msgpack.Unmarshal(packedRatchets, &ratchetList); err != nil { if err := common.MsgpackUnmarshal(packedRatchets, &ratchetList); err != nil {
return fmt.Errorf("failed to unpack ratchet list: %w", err) return fmt.Errorf("failed to unpack ratchet list: %w", err)
} }