fix: ensure b58 can decode hash #103
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
lidel
approved these changes
Nov 11, 2019
src/convert.js
Outdated
| @@ -125,7 +126,7 @@ function buf2str (buf) { | |||
|
|
|||
| function mh2buf (hash) { | |||
| // the address is a varint prefixed multihash string representation | |||
| const mh = Buffer.from(bs58.decode(hash)) | |||
| const mh = bs58.decode((new CID(hash)).toString('base58btc')) | |||
There was a problem hiding this comment.
I think we could remove 1 level of string serialization and use buffer already present in CID?
Suggested change
| const mh = bs58.decode((new CID(hash)).toString('base58btc')) | |
| const mh = new CID(hash).multihash |
There was a problem hiding this comment.
👍 that's much better, and also resolves a toString() issue I was seeing (and added a test for)
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.
While working on the libp2p refactor tests I found an issue with #102, where if a base32 id contains non b58 characters (such as "l"), b58 would throw due to the unsupported character. This fixes that by getting the b58 string from the CID before decoding to a Buffer.