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

Light cleanup #616

Merged
merged 16 commits into from
Nov 14, 2023
Merged

Light cleanup #616

merged 16 commits into from
Nov 14, 2023

Conversation

dryajov
Copy link
Contributor

@dryajov dryajov commented Nov 14, 2023

This merges into #566

@dryajov dryajov changed the title Merge master Merge master into #566 Nov 14, 2023
hcodec: MultiCodec # Multihash codec
codec: MultiCodec # Data set codec
case protected {.serialize.}: bool # Protected datasets have erasure coded info
treeCid: Cid # Root of the merkle tree
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this intentional to remove {.serialize.}?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, no - I guess this was mangled during the merge.

Base automatically changed from blockexchange-uses-merkle-tree to master November 14, 2023 12:02
@dryajov dryajov force-pushed the blockexchange-uses-merkle-tree-merge-master branch 3 times, most recently from bad6531 to 65736fe Compare November 14, 2023 16:01
@dryajov dryajov changed the title Merge master into #566 Light cleanup Nov 14, 2023
@dryajov dryajov enabled auto-merge (squash) November 14, 2023 16:24
@dryajov dryajov enabled auto-merge (squash) November 14, 2023 16:25
@dryajov dryajov enabled auto-merge (squash) November 14, 2023 16:55
@dryajov dryajov force-pushed the blockexchange-uses-merkle-tree-merge-master branch from 65736fe to 17e052e Compare November 14, 2023 16:59
@dryajov dryajov merged commit 8d61391 into master Nov 14, 2023
8 checks passed
@dryajov dryajov deleted the blockexchange-uses-merkle-tree-merge-master branch November 14, 2023 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants