Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: #2 AdditionalData field now sorted into arrays #3

Merged
merged 1 commit into from
Jun 16, 2024
Merged

fix: #2 AdditionalData field now sorted into arrays #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions dag/leaves.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ func (b *DagLeafBuilder) BuildLeaf(additionalData map[string]string) (*DagLeaf,
MerkleRoot []byte
CurrentLinkCount int
ContentHash []byte
AdditionalData map[string]string
AdditionalData []keyValue
}{
ItemName: b.ItemName,
Type: b.LeafType,
MerkleRoot: merkleRoot,
CurrentLinkCount: len(b.Links),
ContentHash: nil,
AdditionalData: additionalData,
AdditionalData: sortMapForVerification(additionalData),
}

if b.Data != nil {
Expand Down Expand Up @@ -190,7 +190,7 @@ func (b *DagLeafBuilder) BuildRootLeaf(dag *DagBuilder, additionalData map[strin
LatestLabel string
LeafCount int
ContentHash []byte
AdditionalData map[string]string
AdditionalData []keyValue
}{
ItemName: b.ItemName,
Type: b.LeafType,
Expand All @@ -199,7 +199,7 @@ func (b *DagLeafBuilder) BuildRootLeaf(dag *DagBuilder, additionalData map[strin
LatestLabel: latestLabel,
LeafCount: len(dag.Leafs),
ContentHash: nil,
AdditionalData: additionalData,
AdditionalData: sortMapForVerification(additionalData),
}

if b.Data != nil {
Expand Down Expand Up @@ -293,14 +293,14 @@ func (leaf *DagLeaf) VerifyLeaf() error {
MerkleRoot []byte
CurrentLinkCount int
ContentHash []byte
AdditionalData map[string]string
AdditionalData []keyValue
}{
ItemName: leaf.ItemName,
Type: leaf.Type,
MerkleRoot: leaf.ClassicMerkleRoot,
CurrentLinkCount: leaf.CurrentLinkCount,
ContentHash: leaf.ContentHash,
AdditionalData: additionalData,
AdditionalData: sortMapForVerification(additionalData),
}

serializedLeafData, err := cbor.Marshal(leafData)
Expand Down Expand Up @@ -363,7 +363,7 @@ func (leaf *DagLeaf) VerifyRootLeaf() error {
LatestLabel string
LeafCount int
ContentHash []byte
AdditionalData map[string]string
AdditionalData []keyValue
}{
ItemName: leaf.ItemName,
Type: leaf.Type,
Expand All @@ -372,7 +372,7 @@ func (leaf *DagLeaf) VerifyRootLeaf() error {
LatestLabel: leaf.LatestLabel,
LeafCount: leaf.LeafCount,
ContentHash: leaf.ContentHash,
AdditionalData: additionalData,
AdditionalData: sortMapForVerification(additionalData),
}

serializedLeafData, err := cbor.Marshal(leafData)
Expand Down Expand Up @@ -572,3 +572,27 @@ func sortMapByKeys(inputMap map[string]string) map[string]string {

return sortedMap
}

type keyValue struct {
Key string
Value string
}

func sortMapForVerification(inputMap map[string]string) []keyValue {
if inputMap == nil {
return nil
}

keys := make([]string, 0, len(inputMap))
for key := range inputMap {
keys = append(keys, key)
}
sort.Strings(keys)

sortedPairs := make([]keyValue, 0, len(keys))
for _, key := range keys {
sortedPairs = append(sortedPairs, keyValue{Key: key, Value: inputMap[key]})
}

return sortedPairs
}
Loading