fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-19 13:01:22 +00:00
Code Issues Projects Releases Wiki Activity

deps: bump multiaddr from 0.17.0 to 0.17.1

Browse Source 
Pull-Request: #3688.
This commit is contained in:
dependabot[bot]
2023-04-04 13:38:53 +00:00
committed by GitHub
parent 5f2fff58c3
commit 95fa913923
11 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -3241,13 +3241,14 @@ dependencies = [
[[package]] [[package]]
name = "multiaddr" name = "multiaddr"
version = "0.17.0" version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"byteorder", "byteorder",
"data-encoding", "data-encoding",
"log",
"multibase", "multibase",
"multihash", "multihash",
"percent-encoding", "percent-encoding",

2
core/Cargo.toml
View File

@ -18,7 +18,7 @@ futures-timer = "3"
instant = "0.1.11" instant = "0.1.11"
libp2p-identity = { version = "0.1", path = "../identity", features = ["peerid", "ed25519"] } libp2p-identity = { version = "0.1", path = "../identity", features = ["peerid", "ed25519"] }
log = "0.4" log = "0.4"
multiaddr = { version = "0.17.0" } multiaddr = { version = "0.17.1" }
multihash = { version = "0.17.0", default-features = false, features = ["std"] } multihash = { version = "0.17.0", default-features = false, features = ["std"] }
multistream-select = { version = "0.12.1", path = "../misc/multistream-select" } multistream-select = { version = "0.12.1", path = "../misc/multistream-select" }
once_cell = "1.17.1" once_cell = "1.17.1"

2
examples/distributed-key-value-store/Cargo.toml
View File

@ -11,4 +11,4 @@ async-trait = "0.1"
env_logger = "0.10" env_logger = "0.10"
futures = "0.3.28" futures = "0.3.28"
libp2p = { path = "../../libp2p", features = ["async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "websocket", "yamux"] } libp2p = { path = "../../libp2p", features = ["async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "websocket", "yamux"] }
multiaddr = { version = "0.17.0" } multiaddr = { version = "0.17.1" }

2
examples/file-sharing/Cargo.toml
View File

@ -13,4 +13,4 @@ either = "1.8"
env_logger = "0.10" env_logger = "0.10"
futures = "0.3.28" futures = "0.3.28"
libp2p = { path = "../../libp2p", features = ["async-std", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] } libp2p = { path = "../../libp2p", features = ["async-std", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] }
multiaddr = { version = "0.17.0" } multiaddr = { version = "0.17.1" }

2
examples/ipfs-private/Cargo.toml
View File

@ -12,4 +12,4 @@ either = "1.8"
env_logger = "0.10" env_logger = "0.10"
futures = "0.3.28" futures = "0.3.28"
libp2p = { path = "../../libp2p", features = ["async-std", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] } libp2p = { path = "../../libp2p", features = ["async-std", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] }
multiaddr = { version = "0.17.0" } multiaddr = { version = "0.17.1" }

2
examples/ping-example/Cargo.toml
View File

@ -10,4 +10,4 @@ async-std = { version = "1.12", features = ["attributes"] }
async-trait = "0.1" async-trait = "0.1"
futures = "0.3.28" futures = "0.3.28"
libp2p = { path = "../../libp2p", features = ["async-std", "dns", "macros", "noise", "ping", "tcp", "websocket", "yamux"] } libp2p = { path = "../../libp2p", features = ["async-std", "dns", "macros", "noise", "ping", "tcp", "websocket", "yamux"] }
multiaddr = { version = "0.17.0" } multiaddr = { version = "0.17.1" }

2
identity/Cargo.toml
View File

@ -17,7 +17,7 @@ bs58 = { version = "0.4.0", optional = true }
ed25519-dalek = { version = "1.0.1", optional = true } ed25519-dalek = { version = "1.0.1", optional = true }
libsecp256k1 = { version = "0.7.0", optional = true } libsecp256k1 = { version = "0.7.0", optional = true }
log = "0.4" log = "0.4"
multiaddr = { version = "0.17.0", optional = true } multiaddr = { version = "0.17.1", optional = true }
multihash = { version = "0.17.0", default-features = false, features = ["std"], optional = true } multihash = { version = "0.17.0", default-features = false, features = ["std"], optional = true }
p256 = { version = "0.12", default-features = false, features = ["ecdsa", "std"], optional = true } p256 = { version = "0.12", default-features = false, features = ["ecdsa", "std"], optional = true }
prost = { version = "0.11", optional = true } prost = { version = "0.11", optional = true }

2
interop-tests/src/bin/ping.rs
View File

@ -77,7 +77,7 @@ async fn main() -> Result<()> {
) )
.map(|(peer_id, conn), _| (peer_id, StreamMuxerBox::new(conn))) .map(|(peer_id, conn), _| (peer_id, StreamMuxerBox::new(conn)))
.boxed(), .boxed(),
format!("/ip4/{ip}/udp/0/webrtc"), format!("/ip4/{ip}/udp/0/webrtc-direct"),
), ),
}; };

2
transports/webrtc/examples/listen_ping.rs
View File

@ -13,7 +13,7 @@ use void::Void;
async fn main() -> Result<()> { async fn main() -> Result<()> {
let mut swarm = create_swarm()?; let mut swarm = create_swarm()?;
swarm.listen_on("/ip4/127.0.0.1/udp/0/webrtc".parse()?)?; swarm.listen_on("/ip4/127.0.0.1/udp/0/webrtc-direct".parse()?)?;
loop { loop {
let event = swarm.next().await.unwrap(); let event = swarm.next().await.unwrap();

16
transports/webrtc/src/tokio/transport.rs
View File

@ -480,7 +480,7 @@ mod tests {
#[test] #[test]
fn parse_valid_address_with_certhash_and_p2p() { fn parse_valid_address_with_certhash_and_p2p() {
let addr = "/ip4/127.0.0.1/udp/39901/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/p2p/12D3KooWNpDk9w6WrEEcdsEH1y47W71S36yFjw4sd3j7omzgCSMS" let addr = "/ip4/127.0.0.1/udp/39901/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/p2p/12D3KooWNpDk9w6WrEEcdsEH1y47W71S36yFjw4sd3j7omzgCSMS"
.parse() .parse()
.unwrap(); .unwrap();
@ -499,7 +499,7 @@ mod tests {
#[test] #[test]
fn peer_id_is_not_required() { fn peer_id_is_not_required() {
let addr = "/ip4/127.0.0.1/udp/39901/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w" let addr = "/ip4/127.0.0.1/udp/39901/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w"
.parse() .parse()
.unwrap(); .unwrap();
@ -518,7 +518,7 @@ mod tests {
#[test] #[test]
fn tcp_is_invalid_protocol() { fn tcp_is_invalid_protocol() {
let addr = "/ip4/127.0.0.1/tcp/12345/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w" let addr = "/ip4/127.0.0.1/tcp/12345/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w"
.parse() .parse()
.unwrap(); .unwrap();
@ -529,7 +529,7 @@ mod tests {
#[test] #[test]
fn cannot_follow_other_protocols_after_certhash() { fn cannot_follow_other_protocols_after_certhash() {
let addr = "/ip4/127.0.0.1/udp/12345/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/tcp/12345" let addr = "/ip4/127.0.0.1/udp/12345/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/tcp/12345"
.parse() .parse()
.unwrap(); .unwrap();
@ -541,7 +541,7 @@ mod tests {
#[test] #[test]
fn parse_ipv6() { fn parse_ipv6() {
let addr = let addr =
"/ip6/::1/udp/12345/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/p2p/12D3KooWNpDk9w6WrEEcdsEH1y47W71S36yFjw4sd3j7omzgCSMS" "/ip6/::1/udp/12345/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/p2p/12D3KooWNpDk9w6WrEEcdsEH1y47W71S36yFjw4sd3j7omzgCSMS"
.parse() .parse()
.unwrap(); .unwrap();
@ -560,7 +560,7 @@ mod tests {
#[test] #[test]
fn can_parse_valid_addr_without_certhash() { fn can_parse_valid_addr_without_certhash() {
let addr = "/ip6/::1/udp/12345/webrtc".parse().unwrap(); let addr = "/ip6/::1/udp/12345/webrtc-direct".parse().unwrap();
let maybe_parsed = parse_webrtc_listen_addr(&addr); let maybe_parsed = parse_webrtc_listen_addr(&addr);
@ -574,7 +574,7 @@ mod tests {
fn fails_to_parse_if_certhash_present_but_wrong_hash_function() { fn fails_to_parse_if_certhash_present_but_wrong_hash_function() {
// We only support SHA2-256 for now but this certhash has been encoded with SHA3-256. // We only support SHA2-256 for now but this certhash has been encoded with SHA3-256.
let addr = let addr =
"/ip6/::1/udp/12345/webrtc/certhash/uFiCH_tkkzpAwkoIDbE4I7QtQksFMYs5nQ4MyYrkgCJYi4A" "/ip6/::1/udp/12345/webrtc-direct/certhash/uFiCH_tkkzpAwkoIDbE4I7QtQksFMYs5nQ4MyYrkgCJYi4A"
.parse() .parse()
.unwrap(); .unwrap();
@ -597,7 +597,7 @@ mod tests {
// is temporarily empty. // is temporarily empty.
for _ in 0..2 { for _ in 0..2 {
let listener = transport let listener = transport
.listen_on("/ip4/0.0.0.0/udp/0/webrtc".parse().unwrap()) .listen_on("/ip4/0.0.0.0/udp/0/webrtc-direct".parse().unwrap())
.unwrap(); .unwrap();
match poll_fn(|cx| Pin::new(&mut transport).as_mut().poll(cx)).await { match poll_fn(|cx| Pin::new(&mut transport).as_mut().poll(cx)).await {
TransportEvent::NewAddress { TransportEvent::NewAddress {

7
transports/webrtc/tests/smoke.rs
View File

@ -41,8 +41,8 @@ async fn smoke() {
let (a_peer_id, mut a_transport) = create_transport(); let (a_peer_id, mut a_transport) = create_transport();
let (b_peer_id, mut b_transport) = create_transport(); let (b_peer_id, mut b_transport) = create_transport();
let addr = start_listening(&mut a_transport, "/ip4/127.0.0.1/udp/0/webrtc").await; let addr = start_listening(&mut a_transport, "/ip4/127.0.0.1/udp/0/webrtc-direct").await;
start_listening(&mut b_transport, "/ip4/127.0.0.1/udp/0/webrtc").await; start_listening(&mut b_transport, "/ip4/127.0.0.1/udp/0/webrtc-direct").await;
let ((a_connected, _, _), (b_connected, _)) = let ((a_connected, _, _), (b_connected, _)) =
connect(&mut a_transport, &mut b_transport, addr).await; connect(&mut a_transport, &mut b_transport, addr).await;
@ -109,7 +109,8 @@ fn prop(number_listeners: NonZeroU8, number_streams: NonZeroU8) -> quickcheck::T
async move { async move {
let (peer_id, mut listener) = create_transport(); let (peer_id, mut listener) = create_transport();
let addr = start_listening(&mut listener, "/ip4/127.0.0.1/udp/0/webrtc").await; let addr =
start_listening(&mut listener, "/ip4/127.0.0.1/udp/0/webrtc-direct").await;
listeners_tx.send((peer_id, addr)).await.unwrap(); listeners_tx.send((peer_id, addr)).await.unwrap();