Remove problematic equivocation

autonomys · Sep 27, 2024 · 74a5f7d · 74a5f7d
1 parent 257958a
commit 74a5f7d
Show file tree

Hide file tree

Showing 22 changed files with 17 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sc-consensus-subspace/Cargo.toml b/crates/sc-consensus-subspace/Cargo.toml
@@ -13,7 +13,7 @@ documentation = "https://docs.rs/sc-consensus-subspace"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 codec = { package = "parity-scale-codec", version = "3.6.12", features = ["derive"] }
 futures = "0.3.29"
 parking_lot = "0.12.2"

diff --git a/crates/sc-subspace-block-relay/Cargo.toml b/crates/sc-subspace-block-relay/Cargo.toml
@@ -12,7 +12,7 @@ include = [
 
 [dependencies]
 async-channel = "1.9.0"
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] }
 derive_more = { version = "1.0.0", features = ["full"] }
 futures = "0.3.29"

diff --git a/crates/sp-consensus-subspace/Cargo.toml b/crates/sp-consensus-subspace/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = { version = "0.1.81", optional = true }
+async-trait = { version = "0.1.83", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false }
 log = { version = "0.4.22", default-features = false }
 scale-info = { version = "2.11.2", default-features = false, features = ["derive"] }

diff --git a/crates/subspace-farmer-components/Cargo.toml b/crates/subspace-farmer-components/Cargo.toml
@@ -17,7 +17,7 @@ bench = false
 
 [dependencies]
 async-lock = "3.3.0"
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 backoff = { version = "0.4.0", features = ["futures", "tokio"] }
 bitvec = "1.0.1"
 # TODO: Switch to fs4 once https://github.com/al8n/fs4-rs/issues/15 is resolved

diff --git a/crates/subspace-farmer/Cargo.toml b/crates/subspace-farmer/Cargo.toml
@@ -19,7 +19,7 @@ required-features = ["binary"]
 anyhow = "1.0.86"
 async-lock = "3.3.0"
 async-nats = { version = "0.35.1", optional = true }
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 backoff = { version = "0.4.0", features = ["futures", "tokio"] }
 base58 = "0.2.0"
 blake2 = "0.10.6"

diff --git a/crates/subspace-farmer/src/cluster/cache.rs b/crates/subspace-farmer/src/cluster/cache.rs
@@ -1,9 +1,3 @@
-// TODO: Remove
-#![allow(
-    elided_named_lifetimes,
-    reason = "https://github.com/dtolnay/async-trait/issues/279"
-)]
-
 //! Farming cluster cache
 //!
 //! Cache is responsible for caching pieces within allocated space to accelerate plotting and serve

diff --git a/crates/subspace-farmer/src/cluster/farmer.rs b/crates/subspace-farmer/src/cluster/farmer.rs
@@ -1,9 +1,3 @@
-// TODO: Remove
-#![allow(
-    elided_named_lifetimes,
-    reason = "https://github.com/dtolnay/async-trait/issues/279"
-)]
-
 //! Farming cluster farmer
 //!
 //! Farmer is responsible for maintaining farms, doing audits and generating proofs when solution is

diff --git a/crates/subspace-farmer/src/disk_piece_cache.rs b/crates/subspace-farmer/src/disk_piece_cache.rs
@@ -1,9 +1,3 @@
-// TODO: Remove
-#![allow(
-    elided_named_lifetimes,
-    reason = "https://github.com/dtolnay/async-trait/issues/279"
-)]
-
 //! Disk piece cache implementation
 
 mod metrics;

diff --git a/crates/subspace-farmer/src/farm.rs b/crates/subspace-farmer/src/farm.rs
@@ -1,9 +1,3 @@
-// TODO: Remove
-#![allow(
-    elided_named_lifetimes,
-    reason = "https://github.com/dtolnay/async-trait/issues/279"
-)]
-
 //! Abstract farm API
 //!
 //! This module provides a bunch of traits and simple data structures that serve as a layer of

diff --git a/crates/subspace-farmer/src/single_disk_farm/piece_cache.rs b/crates/subspace-farmer/src/single_disk_farm/piece_cache.rs
@@ -1,9 +1,3 @@
-// TODO: Remove
-#![allow(
-    elided_named_lifetimes,
-    reason = "https://github.com/dtolnay/async-trait/issues/279"
-)]
-
 //! Cache implementation specific to single disk farm
 
 use crate::disk_piece_cache::DiskPieceCache;

diff --git a/crates/subspace-farmer/src/single_disk_farm/plotted_sectors.rs b/crates/subspace-farmer/src/single_disk_farm/plotted_sectors.rs
@@ -1,9 +1,3 @@
-// TODO: Remove
-#![allow(
-    elided_named_lifetimes,
-    reason = "https://github.com/dtolnay/async-trait/issues/279"
-)]
-
 use crate::farm::{FarmError, PlottedSectors};
 use async_lock::RwLock as AsyncRwLock;
 use async_trait::async_trait;

diff --git a/crates/subspace-networking/Cargo.toml b/crates/subspace-networking/Cargo.toml
@@ -17,7 +17,7 @@ include = [
 
 [dependencies]
 async-mutex = "1.4.0"
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 backoff = { version = "0.4.0", features = ["futures", "tokio"] }
 bytes = "1.7.1"
 clap = { version = "4.5.15", features = ["color", "derive"] }

diff --git a/crates/subspace-service/Cargo.toml b/crates/subspace-service/Cargo.toml
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 array-bytes = "6.2.2"
 async-channel = "1.8.0"
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 cross-domain-message-gossip = { version = "0.1.0", path = "../../domains/client/cross-domain-message-gossip" }
 domain-runtime-primitives = { version = "0.1.0", path = "../../domains/primitives/runtime" }
 frame-benchmarking = { default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631", optional = true }

diff --git a/domains/client/consensus-relay-chain/Cargo.toml b/domains/client/consensus-relay-chain/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 sc-consensus = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631" }
 sp-blockchain = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631" }
 sp-consensus = { git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631" }

diff --git a/domains/primitives/block-fees/Cargo.toml b/domains/primitives/block-fees/Cargo.toml
@@ -13,7 +13,7 @@ include = [
 ]
 
 [dependencies]
-async-trait = { version = "0.1.81", optional = true }
+async-trait = { version = "0.1.83", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] }
 domain-runtime-primitives = { version = "0.1.0", default-features = false, path = "../runtime" }
 sp-inherents = { default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631" }

diff --git a/domains/primitives/domain-sudo/Cargo.toml b/domains/primitives/domain-sudo/Cargo.toml
@@ -14,7 +14,7 @@ include = [
 ]
 
 [dependencies]
-async-trait = { version = "0.1.81", optional = true }
+async-trait = { version = "0.1.83", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] }
 sp-api = { default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631" }
 sp-inherents = { default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631" }

diff --git a/domains/primitives/executive/Cargo.toml b/domains/primitives/executive/Cargo.toml
@@ -14,7 +14,7 @@ include = [
 ]
 
 [dependencies]
-async-trait = { version = "0.1.81", optional = true }
+async-trait = { version = "0.1.83", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] }
 sp-inherents = { default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631" }
 

diff --git a/domains/primitives/messenger/Cargo.toml b/domains/primitives/messenger/Cargo.toml
@@ -14,7 +14,7 @@ include = [
 ]
 
 [dependencies]
-async-trait = { version = "0.1.81", optional = true }
+async-trait = { version = "0.1.83", optional = true }
 codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] }
 frame-support = { default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "5626154d0781ac9a6ffd5a6207ed237f425ae631" }
 hash-db = { version = "0.16.0", default-features = false }

diff --git a/domains/service/Cargo.toml b/domains/service/Cargo.toml
@@ -13,7 +13,7 @@ build = "build.rs"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 cross-domain-message-gossip = { version = "0.1.0", path = "../client/cross-domain-message-gossip" }
 domain-client-block-preprocessor = { package = "domain-block-preprocessor", version = "0.1.0", path = "../client/block-preprocessor" }
 domain-client-consensus-relay-chain = { version = "0.1.0", path = "../client/consensus-relay-chain" }

diff --git a/shared/subspace-data-retrieval/Cargo.toml b/shared/subspace-data-retrieval/Cargo.toml
@@ -12,7 +12,7 @@ include = [
 ]
 
 [dependencies]
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 parity-scale-codec = { version = "3.6.12", features = ["derive"] }
 subspace-archiving = { version = "0.1.0", path = "../../crates/subspace-archiving" }
 subspace-core-primitives = { version = "0.1.0", path = "../../crates/subspace-core-primitives" }

diff --git a/test/subspace-test-service/Cargo.toml b/test/subspace-test-service/Cargo.toml
@@ -15,7 +15,7 @@ include = [
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-async-trait = "0.1.81"
+async-trait = "0.1.83"
 cross-domain-message-gossip = { version = "0.1.0", path = "../../domains/client/cross-domain-message-gossip" }
 codec = { package = "parity-scale-codec", version = "3.6.12", features = ["derive"] }
 domain-client-message-relayer = { version = "0.1.0", path = "../../domains/client/relayer" }