Revert "[Substrate companion] update libp2p to 0.52.0 (#7472)" (#7583)

* Revert "[Substrate companion] update libp2p to 0.52.0 (#7472)"

This reverts commit 7a1d96e1ce.

* Update dependencies

* update lockfile for {"substrate"}

---------

Co-authored-by: parity-processbot <>
This commit is contained in:
Aaro Altonen
2023-08-16 14:39:40 +03:00
committed by GitHub
parent 1756ee0590
commit a0f83eb992
20 changed files with 2463 additions and 1484 deletions
+2441 -1462
View File
File diff suppressed because it is too large Load Diff
@@ -11,7 +11,7 @@ futures-timer = "3.0.2"
parity-scale-codec = { version = "3.6.1", default-features = false, features = ["bit-vec", "derive"] }
gum = { package = "tracing-gum", path = "../../gum" }
bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
lru = "0.11"
lru = "0.11.0"
merlin = "2.0"
schnorrkel = "0.9.1"
kvdb = "0.13.0"
+1 -1
View File
@@ -8,7 +8,7 @@ license.workspace = true
[dependencies]
futures = "0.3.21"
gum = { package = "tracing-gum", path = "../../gum" }
lru = "0.11"
lru = "0.11.0"
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
+1 -1
View File
@@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true
[dependencies]
syn = { version = "2.0.20", features = ["full", "extra-traits"] }
syn = { version = "2.0.15", features = ["full", "extra-traits"] }
quote = "1.0.28"
proc-macro2 = "1.0.56"
proc-macro-crate = "1.1.3"
@@ -157,7 +157,7 @@ impl<N: Network, AD: AuthorityDiscovery> Service<N, AD> {
fn extract_peer_ids(multiaddr: impl Iterator<Item = Multiaddr>) -> HashSet<PeerId> {
multiaddr
.filter_map(|mut addr| match addr.pop() {
Some(multiaddr::Protocol::P2p(peer_id)) => Some(peer_id),
Some(multiaddr::Protocol::P2p(key)) => PeerId::from_multihash(key).ok(),
_ => None,
})
.collect()
@@ -208,7 +208,7 @@ mod tests {
let authorities = known_authorities();
let multiaddr = known_multiaddr().into_iter().zip(peer_ids.iter().cloned()).map(
|(mut addr, peer_id)| {
addr.push(multiaddr::Protocol::P2p(peer_id));
addr.push(multiaddr::Protocol::P2p(peer_id.into()));
HashSet::from([addr])
},
);
@@ -106,7 +106,7 @@ impl MockAuthorityDiscovery {
.clone()
.into_iter()
.map(|(p, a)| {
let multiaddr = Multiaddr::empty().with(Protocol::P2p(p));
let multiaddr = Multiaddr::empty().with(Protocol::P2p(p.into()));
(a, HashSet::from([multiaddr]))
})
.collect();
@@ -566,11 +566,11 @@ fn test_log_output() {
let unconnected_authorities = {
let mut m = HashMap::new();
let peer_id = PeerId::random();
let addr = Multiaddr::empty().with(Protocol::P2p(peer_id));
let addr = Multiaddr::empty().with(Protocol::P2p(peer_id.into()));
let addrs = HashSet::from([addr.clone(), addr]);
m.insert(alice, addrs);
let peer_id = PeerId::random();
let addr = Multiaddr::empty().with(Protocol::P2p(peer_id));
let addr = Multiaddr::empty().with(Protocol::P2p(peer_id.into()));
let addrs = HashSet::from([addr.clone(), addr]);
m.insert(bob, addrs);
m
+1 -1
View File
@@ -18,7 +18,7 @@ polkadot-node-metrics = { path = "../metrics" }
polkadot-primitives = { path = "../../primitives" }
orchestra = "0.0.5"
gum = { package = "tracing-gum", path = "../gum" }
lru = "0.11"
lru = "0.11.0"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
async-trait = "0.1.57"
tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
+1 -1
View File
@@ -87,7 +87,7 @@ parity-db = { version = "0.4.8", optional = true }
codec = { package = "parity-scale-codec", version = "3.6.1" }
async-trait = "0.1.57"
lru = "0.11"
lru = "0.11.0"
log = "0.4.17"
is_executable = "1.0.1"
+1 -1
View File
@@ -20,7 +20,7 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
smallvec = "1.11.0"
smallvec = "1.8.0"
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.31"
async-trait = "0.1.57"
+1 -1
View File
@@ -15,7 +15,7 @@ rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.163", default-features = false }
serde_derive = { version = "1.0.117", optional = true }
static_assertions = "1.1.0"
smallvec = "1.11.0"
smallvec = "1.8.0"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+1 -1
View File
@@ -6,7 +6,7 @@ edition.workspace = true
license.workspace = true
[dependencies]
smallvec = "1.11.0"
smallvec = "1.8.0"
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+1 -1
View File
@@ -15,7 +15,7 @@ rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.163", default-features = false }
serde_derive = { version = "1.0.117", optional = true }
static_assertions = "1.1.0"
smallvec = "1.11.0"
smallvec = "1.8.0"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -6,7 +6,7 @@ edition.workspace = true
license.workspace = true
[dependencies]
smallvec = "1.11.0"
smallvec = "1.8.0"
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+1 -1
View File
@@ -13,7 +13,7 @@ log = { version = "0.4.17", default-features = false }
serde = { version = "1.0.163", default-features = false }
serde_derive = { version = "1.0.117", optional = true }
static_assertions = "1.1.0"
smallvec = "1.11.0"
smallvec = "1.8.0"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+1 -1
View File
@@ -6,7 +6,7 @@ edition.workspace = true
license.workspace = true
[dependencies]
smallvec = "1.11.0"
smallvec = "1.8.0"
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+1 -1
View File
@@ -15,7 +15,7 @@ rustc-hex = { version = "2.1.0", default-features = false }
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.163", default-features = false }
serde_derive = { version = "1.0.117", optional = true }
smallvec = "1.11.0"
smallvec = "1.8.0"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -7,7 +7,7 @@ edition.workspace = true
license.workspace = true
[dependencies]
smallvec = "1.11.0"
smallvec = "1.8.0"
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+1 -1
View File
@@ -14,7 +14,7 @@ log = { version = "0.4.17", default-features = false }
rustc-hex = { version = "2.1.0", default-features = false }
serde = { version = "1.0.163", default-features = false }
serde_derive = { version = "1.0.117", optional = true }
smallvec = "1.11.0"
smallvec = "1.8.0"
authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -6,7 +6,7 @@ edition.workspace = true
license.workspace = true
[dependencies]
smallvec = "1.11.0"
smallvec = "1.8.0"
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
primitives = { package = "polkadot-primitives", path = "../../../primitives", default-features = false }
+1 -1
View File
@@ -11,5 +11,5 @@ proc-macro = true
[dependencies]
proc-macro2 = "1.0.56"
quote = "1.0.28"
syn = "2.0.20"
syn = "2.0.15"
Inflector = "0.11.4"