From 74a5f7d17f4bdc733349b1228fd1d7aafb00746f Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Fri, 27 Sep 2024 20:36:43 +0300 Subject: [PATCH] Remove problematic equivocation --- Cargo.lock | 4 ++-- crates/sc-consensus-subspace/Cargo.toml | 2 +- crates/sc-subspace-block-relay/Cargo.toml | 2 +- crates/sp-consensus-subspace/Cargo.toml | 2 +- crates/subspace-farmer-components/Cargo.toml | 2 +- crates/subspace-farmer/Cargo.toml | 2 +- crates/subspace-farmer/src/cluster/cache.rs | 6 ------ crates/subspace-farmer/src/cluster/farmer.rs | 6 ------ crates/subspace-farmer/src/disk_piece_cache.rs | 6 ------ crates/subspace-farmer/src/farm.rs | 6 ------ crates/subspace-farmer/src/single_disk_farm/piece_cache.rs | 6 ------ .../subspace-farmer/src/single_disk_farm/plotted_sectors.rs | 6 ------ crates/subspace-networking/Cargo.toml | 2 +- crates/subspace-service/Cargo.toml | 2 +- domains/client/consensus-relay-chain/Cargo.toml | 2 +- domains/primitives/block-fees/Cargo.toml | 2 +- domains/primitives/domain-sudo/Cargo.toml | 2 +- domains/primitives/executive/Cargo.toml | 2 +- domains/primitives/messenger/Cargo.toml | 2 +- domains/service/Cargo.toml | 2 +- shared/subspace-data-retrieval/Cargo.toml | 2 +- test/subspace-test-service/Cargo.toml | 2 +- 22 files changed, 17 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 53afbe1bff..3140fa39b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -894,9 +894,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", diff --git a/crates/sc-consensus-subspace/Cargo.toml b/crates/sc-consensus-subspace/Cargo.toml index 651293ec7e..f57f42570d 100644 --- 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 index 5d0dcafcbe..f13650620d 100644 --- 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 index 767932f92c..b8f263c0eb 100644 --- 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 index 88aa5e4c69..3f1bfef9e9 100644 --- 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 index 98dc1198cf..6a7ea44bab 100644 --- 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 index 2dc8cf6feb..04b9a08dfd 100644 --- 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 index 5e1f00cd31..483f12413e 100644 --- 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 index 4c476ccda3..0bdbcd5dfd 100644 --- 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 index acd40d18fe..c755c2d343 100644 --- 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 index 8ce1d2f006..fb1d82434f 100644 --- 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 index bb8350783b..618fb7f89c 100644 --- 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 index 9eb75ee2aa..0babac8d54 100644 --- 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 index d5cd71e0d8..84ff95d3de 100644 --- 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 index a2654d4634..7d17487e73 100644 --- a/domains/client/consensus-relay-chain/Cargo.toml +++ b/domains/client/consensus-relay-chain/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Parity Technologies "] 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 index ae551645fc..e7e1db14f9 100644 --- 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 index 4d9b7f1c89..71389f13af 100644 --- 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 index 91582373e5..ee54d32721 100644 --- 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 index 841e6d0911..33a3bb2f4b 100644 --- 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 index 1d11655110..f43fe7cde8 100644 --- 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 index f63649a5dc..5cf2d86348 100644 --- 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 index a7d8e47d4e..e1b371f49f 100644 --- 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" }