Merged
Conversation
This was referenced May 30, 2023
Closed
Codecov Report
@@ 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
|
…ixfs.v1.pbto prevent collisions with go-merkledag
aschmahmann
force-pushed
the
fix/dagpb-pb-collision
branch
from
128816d to
a0b3155
Compare
Jorropo
approved these changes
Jun 8, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.