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.

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

rename dagpb protobuf to merkledag.v1 #323

Merged
merged 1 commit into from
Jun 8, 2023
Merged

Conversation

aschmahmann
Copy link
Contributor

@aschmahmann aschmahmann commented May 30, 2023

This prevents collisions with the go-merkledag protobuf names. Similar to #318 and #212 and part of resolving #291.

Note: unlike with #318 the protobufs here cannot be regenerated without changing the hashes of tooling like ipfs add <file>. Regeneration would also likely result in a violation of the dag-pb spec since field 2 is supposed to come before 1 even though spec violations occur in the wild and implementations should parse even if 1 comes before 2.

We should test this in kubo to make sure all those test fixtures pass, but any 👀 on if there are more manual changes to be made here would be appreciated (e.g. the .proto file and the file descriptor are left untouched when compared with the ipld/unixfs PR).

Note: this was tested in ipfs/kubo#9907 which is passing.

@codecov
Copy link

codecov bot commented May 30, 2023

Codecov Report

Merging #323 (a0b3155) into main (f29903b) will decrease coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #323      +/-   ##
==========================================
- Coverage   49.59%   49.56%   -0.03%     
==========================================
  Files         283      283              
  Lines       33873    33873              
==========================================
- Hits        16798    16789       -9     
- Misses      15314    15322       +8     
- Partials     1761     1762       +1     
Impacted Files Coverage Δ
ipld/merkledag/pb/merkledag.pb.go 56.70% <100.00%> (+0.35%) ⬆️

... and 10 files with indirect coverage changes

…ixfs.v1.pbto prevent collisions with go-merkledag
@Jorropo Jorropo merged commit 5e3d0e0 into main Jun 8, 2023
@hacdias hacdias deleted the fix/dagpb-pb-collision branch June 27, 2023 11:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants