search

multiformats / js-cid

CID implementation in JavaScript
MIT License
97 stars 39 forks source link

fix: support for identity multihash #93

Closed Gozala closed 4 years ago

Gozala commented 5 years ago

Fixes #92 exception being throw by CID constructor when identity multihash is used

lidel commented 4 years ago

@Gozala are you able to resolve conflicts? @vmx would be good to merge those tests in.

Gozala commented 4 years ago

@lidel thanks for reminding me of this pull (was staring at it puzzled not remembering doing it at all. Then noticed it's from last August 😱)

I'll resolve conflicts sometime today.

vmx commented 4 years ago

It sadly needs another rebase.

andrew commented 4 years ago

@lidel here you go: https://ecosystem-research.herokuapp.com/all?order=asc&sort=created_at&state=open&type=pull_requests&user=lidel

lidel commented 4 years ago

@vmx how do you mean? (CI is green, no conflicts)

vmx commented 4 years ago

@lidel Oh sorry. I had "Rebase and merge" selected (from a previous merge) and then it shows "This branch cannot be rebased due to conflicts")

image

But other ways of merging work.