Make Decode canonicalize CBOR. #17
Merged
Conversation
This file contains 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
magik6k
reviewed
Jun 30, 2017
| if !nd2.Cid().Equals(nd1.Cid()) || !bytes.Equal(nd2.RawData(), nd1.RawData()) { | ||
| t.Fatal("re-decoding a canonical node should be idempotent") | ||
| } | ||
| } |
There was a problem hiding this comment.
If test_objects/non-canon.cbor is taken from go-ipfs I'd add a check for whether CID is zdpuAmxF8q6iTUtkB3xtEYzmc5Sw762qwQJftt5iW8NTWLtjC here
node.go
Outdated
| @@ -77,6 +63,19 @@ func DecodeInto(b []byte, v interface{}) error { | |||
|
|
|||
| } | |||
|
|
|||
| // Decode's a cbor node into an object. | |||
whyrusleeping
approved these changes
Jun 30, 2017
1 similar comment
Also, DRY up CBOR decoding code.
We pre-computed it in e0e7215 but never used it.
1 similar comment
|
@whyrusleeping it should all be fixed (I've also added a bit of documentation to the Decode/DecodeBlock functions). In the future, do you prefer keeping history intact while a PR is under review? |
magik6k
approved these changes
Jul 1, 2017
|
Updated ipfs/kubo#4023 with current gx version of this to see if tests pass |
whyrusleeping
approved these changes
Jul 3, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Also:
gx importgo-block-format because I apparently forgot to do this.gx release 1.2.4so we can use this in ipfs/go-ipfs/#4023I've also imported a variant of the canonicalization test so I don't re-introduce this bug in the future...