Skip to content

Commit

Permalink
Fix lints
Browse files Browse the repository at this point in the history
  • Loading branch information
QuentinI committed Oct 23, 2024
1 parent 95cffae commit ebca3ef
Show file tree
Hide file tree
Showing 25 changed files with 36 additions and 152 deletions.
52 changes: 0 additions & 52 deletions Cargo.lock

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

7 changes: 0 additions & 7 deletions crates/example-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,20 @@ slow-tests = []
gpu-vid = ["hotshot-task-impls/gpu-vid"]

[dependencies]
async-broadcast = { workspace = true }
async-compatibility-layer = { workspace = true }
async-trait = { workspace = true }
anyhow = { workspace = true }
sha3 = "^0.10"
committable = { workspace = true }
either = { workspace = true }
futures = { workspace = true }
hotshot = { path = "../hotshot" }
hotshot-types = { path = "../types" }
hotshot-task-impls = { path = "../task-impls", version = "0.5.36", default-features = false }
rand = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
serde = { workspace = true }
sha2 = { workspace = true }
time = { workspace = true }
async-lock = { workspace = true }
bitvec = { workspace = true }
primitive-types = { workspace = true }
hotshot-task = { path = "../task" }
vbs = { workspace = true }
url = { workspace = true }
reqwest = { workspace = true }
Expand Down
16 changes: 8 additions & 8 deletions crates/example-types/src/node_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
// You should have received a copy of the MIT License
// along with the HotShot repository. If not, see <https://mit-license.org/>.

use crate::{
auction_results_provider_types::{TestAuctionResult, TestAuctionResultsProvider},
block_types::{TestBlockHeader, TestBlockPayload, TestTransaction},
state_types::{TestInstanceState, TestValidatedState},
storage_types::TestStorage,
};
use hotshot::traits::{
election::{
randomized_committee::RandomizedCommittee, static_committee::StaticCommittee,
Expand All @@ -18,15 +12,21 @@ use hotshot::traits::{
implementations::{CombinedNetworks, Libp2pNetwork, MemoryNetwork, PushCdnNetwork},
NodeImplementation,
};
use hotshot_types::data::EpochNumber;
use hotshot_types::{
data::ViewNumber,
data::{EpochNumber, ViewNumber},
signature_key::{BLSPubKey, BuilderKey},
traits::node_implementation::{NodeType, Versions},
};
use serde::{Deserialize, Serialize};
use vbs::version::StaticVersion;

use crate::{
auction_results_provider_types::{TestAuctionResult, TestAuctionResultsProvider},
block_types::{TestBlockHeader, TestBlockPayload, TestTransaction},
state_types::{TestInstanceState, TestValidatedState},
storage_types::TestStorage,
};

#[derive(
Copy,
Clone,
Expand Down
15 changes: 1 addition & 14 deletions crates/examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,38 +81,25 @@ name = "whitelist-push-cdn"
path = "push-cdn/whitelist-adapter.rs"

[dependencies]
async-broadcast = { workspace = true }
async-compatibility-layer = { workspace = true }
async-lock = { workspace = true }
async-trait = { workspace = true }
bimap = "0.6"
clap = { workspace = true, optional = true }
committable = { workspace = true }
dashmap = "6"
either = { workspace = true }
futures = { workspace = true }
hotshot-orchestrator = { version = "0.5.36", path = "../orchestrator", default-features = false }
hotshot-task-impls = { path = "../task-impls", version = "0.5.36", default-features = false }
hotshot-types = { path = "../types" }
hotshot-testing = { path = "../testing" }
hotshot-task-impls = { path = "../task-impls", version = "0.5.36", default-features = false }
libp2p-identity = { workspace = true }
libp2p-networking = { workspace = true }
rand = { workspace = true }
serde = { workspace = true, features = ["rc"] }
thiserror = { workspace = true }
surf-disco = { workspace = true }
time = { workspace = true }
derive_more = { workspace = true }
portpicker.workspace = true
lru.workspace = true
hotshot-task = { path = "../task" }
hotshot = { path = "../hotshot" }
hotshot-example-types = { path = "../example-types" }
chrono = { workspace = true }
vbs = { workspace = true }
sha2.workspace = true
local-ip-address = "0.6"
vec1 = { workspace = true }
url = { workspace = true }

tracing = { workspace = true }
Expand Down
2 changes: 0 additions & 2 deletions crates/fakeapi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ anyhow = { workspace = true }
async-compatibility-layer = { workspace = true }
hotshot-types = { path = "../types" }
vbs = { workspace = true }
serde = { workspace = true }
rand = { workspace = true }
hotshot-example-types = { path = "../example-types" }
async-trait = { workspace = true }
futures = { workspace = true }
async-lock = { workspace = true }
tracing = { workspace = true }

[lints]
workspace = true
8 changes: 0 additions & 8 deletions crates/hotshot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ example-upgrade = ["hotshot-task-impls/example-upgrade"]
gpu-vid = ["hotshot-task-impls/gpu-vid"]
rewind = ["hotshot-task-impls/rewind"]

# Features required for binaries
bin-orchestrator = ["clap"]

# Build the extended documentation
docs = []
doc-images = []
Expand All @@ -30,7 +27,6 @@ async-trait = { workspace = true }
bimap = "0.6"
bincode = { workspace = true }
chrono = { workspace = true }
clap = { workspace = true, optional = true }
committable = { workspace = true }
dashmap = "6"
derive_more = { workspace = true }
Expand All @@ -46,14 +42,10 @@ lru.workspace = true
portpicker = "0.1"
rand = { workspace = true }
serde = { workspace = true, features = ["rc"] }
thiserror = { workspace = true }
surf-disco = { workspace = true }
time = { workspace = true }
tracing = { workspace = true }
vbs = { workspace = true }
jf-signature.workspace = true
blake3.workspace = true
sha2 = { workspace = true }
url = { workspace = true }
num_enum = "0.7"
parking_lot = "0.12"
Expand Down
3 changes: 1 addition & 2 deletions crates/hotshot/src/tasks/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ pub mod task_state;
use std::{fmt::Debug, sync::Arc, time::Duration};

use async_broadcast::{broadcast, RecvError};
use async_compatibility_layer::art::async_sleep;
use async_compatibility_layer::art::async_spawn;
use async_compatibility_layer::art::{async_sleep, async_spawn};
use async_lock::RwLock;
use async_trait::async_trait;
use futures::{
Expand Down
Loading

0 comments on commit ebca3ef

Please sign in to comment.