Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
167 changes: 160 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ indexmap = { version = "2.9.0", features = ["std"] }
libc = "0.2.158"
mockall = "0.13.1"
multiaddr = "0.17.0"
multihash = { version = "0.17.0", default-features = false, features = ["std", "multihash-impl", "identity", "sha2", "blake2b"] }
multihash = "0.19.3"
multihash-codetable = { version = "0.1.4", features = ["blake2b", "sha2"] }
network-interface = "2.0.1"
parking_lot = "0.12.3"
pin-project = "1.1.10"
Expand Down
11 changes: 5 additions & 6 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@
use crate::{
protocol::Direction,
transport::manager::limits::ConnectionLimitsError,
types::{protocol::ProtocolName, ConnectionId, SubstreamId},
types::{multihash::Multihash, protocol::ProtocolName, ConnectionId, SubstreamId},
PeerId,
};

use multiaddr::Multiaddr;
use multihash::{Multihash, MultihashGeneric};

use std::io::{self, ErrorKind};

Expand Down Expand Up @@ -425,8 +424,8 @@ pub enum DnsError {
IpVersionMismatch,
}

impl From<MultihashGeneric<64>> for Error {
fn from(hash: MultihashGeneric<64>) -> Self {
impl From<Multihash> for Error {
fn from(hash: Multihash) -> Self {
Error::AddressError(AddressError::InvalidPeerId(hash))
}
}
Expand Down Expand Up @@ -497,8 +496,8 @@ impl From<ParseError> for Error {
}
}

impl From<MultihashGeneric<64>> for AddressError {
fn from(hash: MultihashGeneric<64>) -> Self {
impl From<Multihash> for AddressError {
fn from(hash: Multihash) -> Self {
AddressError::InvalidPeerId(hash)
}
}
Expand Down
5 changes: 1 addition & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,6 @@ mod tests {
Litep2p, Litep2pEvent, PeerId,
};
use multiaddr::{Multiaddr, Protocol};
use multihash::Multihash;
use std::net::Ipv4Addr;

#[tokio::test]
Expand Down Expand Up @@ -649,9 +648,7 @@ mod tests {
let address = Multiaddr::empty()
.with(Protocol::Ip4(Ipv4Addr::new(255, 254, 253, 252)))
.with(Protocol::Tcp(8888))
.with(Protocol::P2p(
Multihash::from_bytes(&peer.to_bytes()).unwrap(),
));
.with(Protocol::P2p(multiaddr::multihash::Multihash::from(peer)));

let mut litep2p = Litep2p::new(config).unwrap();
litep2p.dial_address(address.clone()).await.unwrap();
Expand Down
Loading
Loading