lint

hotshot-task-impls/src/events.rs

@@ -461,7 +461,7 @@ impl<TYPES: NodeType> Display for HotShotEvent<TYPES> {
                     "ViewChange(view_number={view_number:?}, epoch_number={epoch_number:?})"
                 )
             },
-            HotShotEvent::ViewSyncTimeout(view_number, _, _) => {
+            HotShotEvent::ViewSyncTimeout(view_number, ..) => {
                 write!(f, "ViewSyncTimeout(view_number={view_number:?})")
             },
             HotShotEvent::ViewSyncPreCommitVoteRecv(vote) => write!(
@@ -616,7 +616,7 @@ impl<TYPES: NodeType> Display for HotShotEvent<TYPES> {
                     proposal.data.view_number()
                 )
             },
-            HotShotEvent::VidRequestSend(request, _, _) => {
+            HotShotEvent::VidRequestSend(request, ..) => {
                 write!(f, "VidRequestSend(view_number={:?}", request.view)
             },
             HotShotEvent::VidRequestRecv(request, _) => {

sequencer/src/api.rs

@@ -1673,19 +1673,19 @@ mod api_tests {
 
 #[cfg(test)]
 mod test {
-    use committable::{Commitment, Committable};
     use std::{
         collections::{BTreeMap, HashSet},
         time::Duration,
     };
-    use tokio::time::sleep;
 
+    use committable::{Commitment, Committable};
     use espresso_types::{
         config::PublicHotShotConfig,
         traits::NullEventConsumer,
         v0_1::{UpgradeMode, ViewBasedUpgrade},
-        BackoffParams, FeeAccount, FeeAmount, Header, MarketplaceVersion, MockSequencerVersions,
-        SequencerVersions, TimeBasedUpgrade, Timestamp, Upgrade, UpgradeType, ValidatedState,
+        BackoffParams, EpochVersion, FeeAccount, FeeAmount, Header, MarketplaceVersion,
+        MockSequencerVersions, SequencerVersions, TimeBasedUpgrade, Timestamp, Upgrade,
+        UpgradeType, ValidatedState,
     };
     use ethers::utils::Anvil;
     use futures::{
@@ -1712,7 +1712,7 @@ mod test {
     };
     use tide_disco::{app::AppHealth, error::ServerError, healthcheck::HealthStatus};
     use time::OffsetDateTime;
-
+    use tokio::time::sleep;
     use vbs::version::{StaticVersion, StaticVersionType, Version};
 
     use self::{
@@ -1725,7 +1725,6 @@ mod test {
         persistence::no_storage,
         testing::{TestConfig, TestConfigBuilder},
     };
-    use espresso_types::EpochVersion;
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_healthcheck() {

sequencer/src/bin/update-permissioned-stake-table.rs

@@ -6,7 +6,6 @@ use client::SequencerClient;
 use espresso_types::parse_duration;
 use ethers::types::Address;
 use hotshot_types::{network::PeerConfigKeys, traits::signature_key::StakeTableEntryType};
-
 use sequencer_utils::{
     logging,
     stake_table::{update_stake_table, PermissionedStakeTableUpdate},

sequencer/src/persistence.rs

@@ -43,9 +43,7 @@ mod testing {
 #[cfg(test)]
 #[espresso_macros::generic_tests]
 mod persistence_tests {
-    use sequencer_utils::test_utils::setup_test;
     use std::{collections::BTreeMap, marker::PhantomData, sync::Arc};
-    use vbs::version::StaticVersionType;
 
     use anyhow::bail;
     use async_lock::RwLock;
@@ -80,9 +78,10 @@ mod persistence_tests {
         vid::avidm::{init_avidm_param, AvidMScheme},
         vote::HasViewNumber,
     };
+    use sequencer_utils::test_utils::setup_test;
+    use vbs::version::{StaticVersionType, Version};
 
     use super::{testing::TestablePersistence, *};
-    use vbs::version::Version;
 
     #[derive(Clone, Debug, Default)]
     struct EventCollector {

tests/common/mod.rs

@@ -1,21 +1,21 @@
+use std::{fmt, str::FromStr, time::Duration};
+
 use anyhow::{anyhow, Context, Result};
 use client::SequencerClient;
+use dotenvy::var;
 use espresso_types::{FeeAmount, FeeVersion, MarketplaceVersion};
 use ethers::prelude::*;
-use futures::future::{join_all, BoxFuture};
-use futures::FutureExt;
-use hotshot_types::network::PeerConfigKeys;
-use hotshot_types::traits::signature_key::StakeTableEntryType;
-
-use std::{fmt, str::FromStr, time::Duration};
-use surf_disco::Url;
-use tokio::time::{sleep, timeout};
-use vbs::version::StaticVersionType;
-
-use dotenvy::var;
+use futures::{
+    future::{join_all, BoxFuture},
+    FutureExt,
+};
+use hotshot_types::{network::PeerConfigKeys, traits::signature_key::StakeTableEntryType};
 use sequencer_utils::stake_table::{
     update_stake_table, PermissionedStakeTableUpdate, StakerIdentity,
 };
+use surf_disco::Url;
+use tokio::time::{sleep, timeout};
+use vbs::version::StaticVersionType;
 
 const L1_PROVIDER_RETRY_INTERVAL: Duration = Duration::from_secs(1);
 // TODO add to .env

tests/smoke.rs

@@ -1,8 +1,10 @@
-use crate::common::{test_stake_table_update, TestConfig};
+use std::time::Instant;
+
 use anyhow::{Context, Result};
 use futures::StreamExt;
 use sequencer_utils::test_utils::setup_test;
-use std::time::Instant;
+
+use crate::common::{test_stake_table_update, TestConfig};
 
 /// We allow for no change in state across this many consecutive iterations.
 const MAX_STATE_NOT_INCREMENTING: u8 = 1;

tests/upgrades.rs

@@ -1,10 +1,11 @@
-use crate::common::{test_stake_table_update, TestConfig};
 use anyhow::Result;
 use client::SequencerClient;
 use espresso_types::{EpochVersion, FeeVersion, MarketplaceVersion};
 use futures::{future::join_all, StreamExt};
 use vbs::version::{StaticVersionType, Version};
 
+use crate::common::{test_stake_table_update, TestConfig};
+
 const SEQUENCER_BLOCKS_TIMEOUT: u64 = 200;
 
 #[tokio::test(flavor = "multi_thread")]

types/src/v0/impls/instance_state.rs

@@ -314,10 +314,8 @@ pub mod mock {
 #[cfg(test)]
 mod test {
 
-    use crate::v0::Versions;
-    use crate::{EpochVersion, FeeVersion, SequencerVersions, ViewBasedUpgrade};
-
     use super::*;
+    use crate::{v0::Versions, EpochVersion, FeeVersion, SequencerVersions, ViewBasedUpgrade};
 
     #[test]
     fn test_upgrade_chain_config_version_02() {