Skip to content

Remove temporary peer ID compatibility mode. #1608

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.

Sign up for GitHub

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

Merged
romanb merged 7 commits into from
Aug 26, 2020
Merged

Remove temporary peer ID compatibility mode. #1608

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3147a41
Remove temporary peer ID compatibility.
Jun 15, 2020
745ba13
Merge branch 'master' into finish-peer-id-migration
romanb Aug 11, 2020
c308938
Merge branch 'master' into finish-peer-id-migration
romanb Aug 24, 2020
c251d8f
Check digest length in PeerId::from_multihash for Identity hash.
Aug 25, 2020
ef70db9
Update core/src/peer_id.rs
romanb Aug 25, 2020
7504764
Update core changelog.
Aug 26, 2020
10df04b
Update core changelog.
Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update core/src/peer_id.rs 
Co-authored-by: Toralf Wittner <[email protected]>
  • Loading branch information
@romanb @twittner
romanb and twittner authored Aug 25, 2020
commit ef70db93ce6b1847e25c0ec06b4e05f772a792d2
5 changes: 1 addition & 4 deletions core/src/peer_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,7 @@ impl PeerId {
/// back the data as an error.
pub fn from_bytes(data: Vec<u8>) -> Result<PeerId, Vec<u8>> {
match Multihash::from_bytes(data) {
Ok(multihash) => match multihash.algorithm() {
Code::Sha2_256 | Code::Identity => Ok(PeerId { multihash }),
_ => Err(multihash.into_bytes())
},
Ok(multihash) => PeerId::from_multihash(multihash).map_err(Multihash::into_bytes),
Err(err) => Err(err.data),
}
}
Expand Down