Merge pull request #6233 from jferrant/chore/cleanup-unused-imports-clippy

jferrant · web-flow · commit f87444b410f8 · 2025-06-30T19:05:38.000Z
Remove unused imports throughout stacks core
diff --git a/clarity/src/vm/tests/assets.rs b/clarity/src/vm/tests/assets.rs
@@ -13,21 +13,28 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+#[cfg(test)]
 use stacks_common::types::StacksEpochId;
 
-use crate::vm::ast::ASTRules;
-use crate::vm::contexts::{AssetMap, AssetMapEntry, OwnedEnvironment};
-use crate::vm::errors::{CheckErrors, Error, RuntimeErrorType};
+use crate::vm::contexts::{AssetMap, OwnedEnvironment};
+use crate::vm::errors::Error;
 use crate::vm::events::StacksTransactionEvent;
 use crate::vm::representations::SymbolicExpression;
-use crate::vm::tests::{
-    execute, is_committed, is_err_code, symbols_from_values, test_clarity_versions, test_epochs,
-    tl_env_factory as env_factory, TopLevelMemoryEnvironmentGenerator,
+use crate::vm::tests::{test_clarity_versions, test_epochs};
+use crate::vm::types::{PrincipalData, QualifiedContractIdentifier, Value};
+#[cfg(test)]
+use crate::vm::{
+    ast::ASTRules,
+    contexts::AssetMapEntry,
+    errors::{CheckErrors, RuntimeErrorType},
+    tests::{
+        execute, is_committed, is_err_code, symbols_from_values, tl_env_factory as env_factory,
+        TopLevelMemoryEnvironmentGenerator,
+    },
+    types::AssetIdentifier,
+    version::ClarityVersion,
+    ContractContext,
 };
-use crate::vm::types::{AssetIdentifier, PrincipalData, QualifiedContractIdentifier, Value};
-use crate::vm::version::ClarityVersion;
-use crate::vm::ContractContext;
 
 const FIRST_CLASS_TOKENS: &str = "(define-fungible-token stackaroos)
          (define-read-only (my-ft-get-balance (account principal))
diff --git a/clarity/src/vm/tests/contracts.rs b/clarity/src/vm/tests/contracts.rs
@@ -16,23 +16,23 @@
 
 #[cfg(any(test, feature = "testing"))]
 use rstest::rstest;
-use stacks_common::types::chainstate::BlockHeaderHash;
-use stacks_common::types::StacksEpochId;
+#[cfg(test)]
+use stacks_common::types::{chainstate::BlockHeaderHash, StacksEpochId};
 
-use crate::vm::ast::errors::ParseErrors;
-use crate::vm::ast::ASTRules;
 use crate::vm::contexts::Environment;
-use crate::vm::errors::{CheckErrors, Error, RuntimeErrorType};
-use crate::vm::tests::{
-    env_factory, execute, is_committed, is_err_code_i128 as is_err_code, symbols_from_values,
-    test_clarity_versions, test_epochs, tl_env_factory, MemoryEnvironmentGenerator,
-    TopLevelMemoryEnvironmentGenerator,
+use crate::vm::tests::{test_clarity_versions, test_epochs};
+use crate::vm::types::{PrincipalData, QualifiedContractIdentifier, StandardPrincipalData, Value};
+#[cfg(test)]
+use crate::vm::{
+    ast::{errors::ParseErrors, ASTRules},
+    errors::{CheckErrors, Error, RuntimeErrorType},
+    tests::{
+        env_factory, execute, is_committed, is_err_code_i128 as is_err_code, symbols_from_values,
+        tl_env_factory, MemoryEnvironmentGenerator, TopLevelMemoryEnvironmentGenerator,
+    },
+    types::{OptionalData, ResponseData, TypeSignature},
+    {execute as vm_execute, ClarityVersion, ContractContext},
 };
-use crate::vm::types::{
-    OptionalData, PrincipalData, QualifiedContractIdentifier, ResponseData, StandardPrincipalData,
-    TypeSignature, Value,
-};
-use crate::vm::{execute as vm_execute, ClarityVersion, ContractContext};
 
 const FACTORIAL_CONTRACT: &str = "(define-map factorials { id: int } { current: int, index: int })
          (define-private (init-factorial (id int) (factorial int))
diff --git a/clarity/src/vm/tests/datamaps.rs b/clarity/src/vm/tests/datamaps.rs
@@ -13,10 +13,12 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-use crate::vm::errors::{CheckErrors, Error, ShortReturnType};
-use crate::vm::types::{
-    ListData, SequenceData, TupleData, TupleTypeSignature, TypeSignature, Value,
+use crate::vm::errors::Error;
+use crate::vm::types::{TupleData, Value};
+#[cfg(test)]
+use crate::vm::{
+    errors::{CheckErrors, ShortReturnType},
+    types::{ListData, SequenceData, TupleTypeSignature, TypeSignature},
 };
 use crate::vm::{execute, ClarityName};
 
diff --git a/clarity/src/vm/tests/defines.rs b/clarity/src/vm/tests/defines.rs
@@ -18,14 +18,21 @@
 use rstest::rstest;
 #[cfg(test)]
 use rstest_reuse::{self, *};
+#[cfg(test)]
 use stacks_common::types::StacksEpochId;
 
-use crate::vm::ast::build_ast;
-use crate::vm::ast::errors::{ParseError, ParseErrors};
-use crate::vm::errors::{CheckErrors, Error, RuntimeErrorType};
+use crate::vm::errors::{CheckErrors, Error};
 use crate::vm::tests::test_clarity_versions;
-use crate::vm::types::{QualifiedContractIdentifier, TypeSignature, Value};
-use crate::vm::{execute, ClarityVersion};
+#[cfg(test)]
+use crate::vm::{
+    ast::{
+        build_ast,
+        errors::{ParseError, ParseErrors},
+    },
+    errors::RuntimeErrorType,
+    types::{QualifiedContractIdentifier, TypeSignature, Value},
+    {execute, ClarityVersion},
+};
 
 fn assert_eq_err(e1: CheckErrors, e2: Error) {
     let e1: Error = e1.into();
diff --git a/clarity/src/vm/tests/mod.rs b/clarity/src/vm/tests/mod.rs
@@ -14,18 +14,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#![allow(unused_imports)]
-
 use stacks_common::consts::{CHAIN_ID_MAINNET, CHAIN_ID_TESTNET};
 use stacks_common::types::StacksEpochId;
 
 pub use super::test_util::*;
+#[cfg(test)]
 use super::ClarityVersion;
 use crate::vm::contexts::OwnedEnvironment;
 pub use crate::vm::database::BurnStateDB;
 use crate::vm::database::MemoryBackingStore;
-use crate::vm::errors::Error;
-use crate::vm::types::Value;
+#[cfg(test)]
+use crate::{vm::errors::Error, vm::types::Value};
 
 mod assets;
 mod contracts;
diff --git a/clarity/src/vm/tests/principals.rs b/clarity/src/vm/tests/principals.rs
@@ -1,15 +1,17 @@
-use hashbrown::HashMap;
 use stacks_common::types::StacksEpochId;
 use stacks_common::util::hash::hex_bytes;
 
 use crate::vm::ast::ASTRules;
-use crate::vm::errors::CheckErrors;
-use crate::vm::functions::principals::PrincipalConstructErrorCode;
-use crate::vm::types::TypeSignature::PrincipalType;
 use crate::vm::types::{
     ASCIIData, BuffData, CharType, OptionalData, PrincipalData, QualifiedContractIdentifier,
-    ResponseData, SequenceData, StandardPrincipalData, TupleData, TypeSignature, Value, BUFF_1,
-    BUFF_20,
+    SequenceData, StandardPrincipalData, TupleData, Value,
+};
+#[cfg(test)]
+use crate::vm::{
+    errors::CheckErrors,
+    functions::principals::PrincipalConstructErrorCode,
+    types::TypeSignature::PrincipalType,
+    types::{ResponseData, TypeSignature, BUFF_1, BUFF_20},
 };
 use crate::vm::{execute_with_parameters, ClarityVersion};
 
diff --git a/clarity/src/vm/tests/sequences.rs b/clarity/src/vm/tests/sequences.rs
@@ -16,16 +16,25 @@
 
 use rstest::rstest;
 use rstest_reuse::{self, *};
+#[cfg(test)]
 use stacks_common::types::StacksEpochId;
 
-use crate::vm::errors::{CheckErrors, Error, RuntimeErrorType};
 use crate::vm::tests::test_clarity_versions;
-use crate::vm::types::signatures::SequenceSubtype;
-use crate::vm::types::signatures::SequenceSubtype::{BufferType, StringType};
-use crate::vm::types::signatures::StringSubtype::ASCII;
-use crate::vm::types::TypeSignature::{BoolType, IntType, SequenceType, UIntType};
-use crate::vm::types::{BufferLength, StringSubtype, StringUTF8Length, TypeSignature, Value};
-use crate::vm::{execute, execute_v2, ClarityVersion};
+#[cfg(test)]
+use crate::vm::{
+    errors::{CheckErrors, Error, RuntimeErrorType},
+    execute, execute_v2,
+    types::{
+        signatures::{
+            SequenceSubtype::{self, BufferType, StringType},
+            StringSubtype::ASCII,
+        },
+        BufferLength, StringSubtype, StringUTF8Length,
+        TypeSignature::{self, BoolType, IntType, SequenceType, UIntType},
+        Value,
+    },
+    ClarityVersion,
+};
 
 #[test]
 fn test_simple_list_admission() {
diff --git a/clarity/src/vm/tests/simple_apply_eval.rs b/clarity/src/vm/tests/simple_apply_eval.rs
@@ -36,7 +36,7 @@ use crate::vm::tests::{execute, test_clarity_versions};
 use crate::vm::types::signatures::*;
 use crate::vm::types::{
     ASCIIData, BuffData, CharType, PrincipalData, QualifiedContractIdentifier, SequenceData,
-    StacksAddressExtensions, TypeSignature,
+    TypeSignature,
 };
 use crate::vm::{
     eval, execute as vm_execute, execute_v2 as vm_execute_v2,
diff --git a/clarity/src/vm/tests/traits.rs b/clarity/src/vm/tests/traits.rs
@@ -13,18 +13,21 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+#[cfg(test)]
 use stacks_common::types::StacksEpochId;
 
+#[cfg(test)]
 use super::MemoryEnvironmentGenerator;
-use crate::vm::ast::ASTRules;
-use crate::vm::errors::{CheckErrors, Error};
-use crate::vm::tests::{
-    env_factory, execute, symbols_from_values, test_clarity_versions, test_epochs,
+use crate::vm::tests::{test_clarity_versions, test_epochs};
+#[cfg(test)]
+use crate::vm::{
+    ast::ASTRules,
+    errors::{CheckErrors, Error},
+    tests::{env_factory, execute, symbols_from_values},
+    types::{PrincipalData, QualifiedContractIdentifier, Value},
+    version::ClarityVersion,
+    ContractContext,
 };
-use crate::vm::types::{PrincipalData, QualifiedContractIdentifier, Value};
-use crate::vm::version::ClarityVersion;
-use crate::vm::ContractContext;
 
 #[apply(test_clarity_versions)]
 fn test_dynamic_dispatch_by_defining_trait(
diff --git a/clarity/src/vm/tests/variables.rs b/clarity/src/vm/tests/variables.rs
@@ -16,17 +16,20 @@
 
 #[cfg(any(test, feature = "testing"))]
 use rstest::rstest;
+#[cfg(test)]
 use stacks_common::types::StacksEpochId;
 
+use crate::vm::tests::test_clarity_versions;
 #[cfg(test)]
-use crate::vm::analysis::type_checker::v2_1::tests::contracts::type_check_version;
-use crate::vm::analysis::{run_analysis, CheckError};
-use crate::vm::ast::{parse, ASTRules};
-use crate::vm::database::MemoryBackingStore;
-use crate::vm::errors::{CheckErrors, Error};
-use crate::vm::tests::{test_clarity_versions, tl_env_factory, TopLevelMemoryEnvironmentGenerator};
-use crate::vm::types::{QualifiedContractIdentifier, Value};
-use crate::vm::{ClarityVersion, ContractContext};
+use crate::vm::{
+    analysis::type_checker::v2_1::tests::contracts::type_check_version,
+    ast::{parse, ASTRules},
+    database::MemoryBackingStore,
+    errors::{CheckErrors, Error},
+    tests::{tl_env_factory, TopLevelMemoryEnvironmentGenerator},
+    types::{QualifiedContractIdentifier, Value},
+    ClarityVersion, ContractContext,
+};
 
 #[apply(test_clarity_versions)]
 fn test_block_height(
diff --git a/libsigner/src/events.rs b/libsigner/src/events.rs
@@ -16,7 +16,7 @@
 
 use std::fmt::Debug;
 use std::io::{Read, Write};
-use std::net::{SocketAddr, TcpListener, TcpStream};
+use std::net::{SocketAddr, TcpStream};
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::Sender;
 use std::sync::Arc;
@@ -26,34 +26,23 @@ use blockstack_lib::chainstate::nakamoto::NakamotoBlock;
 use blockstack_lib::chainstate::stacks::boot::{MINERS_NAME, SIGNERS_NAME};
 use blockstack_lib::chainstate::stacks::events::StackerDBChunksEvent;
 use blockstack_lib::chainstate::stacks::StacksTransaction;
-use blockstack_lib::net::api::postblock_proposal::{
-    BlockValidateReject, BlockValidateResponse, ValidateRejectCode,
-};
-use blockstack_lib::net::stackerdb::MINER_SLOT_COUNT;
-use blockstack_lib::util_lib::boot::boot_code_id;
+use blockstack_lib::net::api::postblock_proposal::BlockValidateResponse;
 use blockstack_lib::version_string;
 use clarity::types::chainstate::StacksBlockId;
-use clarity::vm::types::serialization::SerializationError;
-use clarity::vm::types::QualifiedContractIdentifier;
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
 use stacks_common::codec::{
-    read_next, read_next_at_most, read_next_exact, write_next, Error as CodecError,
-    StacksMessageCodec,
+    read_next, read_next_at_most, write_next, Error as CodecError, StacksMessageCodec,
 };
-pub use stacks_common::consts::SIGNER_SLOTS_PER_USER;
 use stacks_common::types::chainstate::{
-    BlockHeaderHash, BurnchainHeaderHash, ConsensusHash, SortitionId, StacksPublicKey,
+    BlockHeaderHash, BurnchainHeaderHash, ConsensusHash, StacksPublicKey,
 };
-use stacks_common::util::hash::{hex_bytes, Hash160, Sha512Trunc256Sum};
+use stacks_common::util::hash::{hex_bytes, Sha512Trunc256Sum};
 use stacks_common::util::serde_serializers::{prefix_hex, prefix_opt_hex, prefix_string_0x};
-use stacks_common::util::HexError;
 use stacks_common::versions::STACKS_NODE_VERSION;
 use tiny_http::{
     Method as HttpMethod, Request as HttpRequest, Response as HttpResponse, Server as HttpServer,
 };
 
-use crate::http::{decode_http_body, decode_http_request};
 use crate::v0::messages::BLOCK_RESPONSE_DATA_MAX_SIZE;
 use crate::EventError;
 
diff --git a/libsigner/src/http.rs b/libsigner/src/http.rs
@@ -16,7 +16,6 @@
 
 use std::io;
 use std::io::{Read, Write};
-use std::net::SocketAddr;
 
 use hashbrown::HashMap;
 use stacks_common::codec::MAX_MESSAGE_LEN;
diff --git a/libsigner/src/libsigner.rs b/libsigner/src/libsigner.rs
@@ -21,8 +21,8 @@
 Usage documentation can be found in the [README](https://github.com/stacks-network/stacks-blockchain/libsigner/README.md).
 */
 
-#![allow(unused_imports)]
 #![allow(dead_code)]
+#[allow(unused_imports)]
 #[macro_use(o, slog_log, slog_trace, slog_debug, slog_info, slog_warn, slog_error)]
 extern crate slog;
 
diff --git a/libsigner/src/runloop.rs b/libsigner/src/runloop.rs
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#![allow(unused_imports)]
 #![allow(dead_code)]
 
 use std::marker::PhantomData;
@@ -24,7 +23,6 @@ use std::thread;
 use std::thread::JoinHandle;
 use std::time::Duration;
 
-use clarity::codec::StacksMessageCodec;
 use stacks_common::deps_common::ctrlc as termination;
 use stacks_common::deps_common::ctrlc::SignalId;
 
diff --git a/libsigner/src/session.rs b/libsigner/src/session.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::net::{SocketAddr, TcpStream};
+use std::net::TcpStream;
 use std::str;
 
 use clarity::vm::types::QualifiedContractIdentifier;
diff --git a/libsigner/src/tests/mod.rs b/libsigner/src/tests/mod.rs
@@ -17,33 +17,26 @@
 mod http;
 mod signer_state;
 
-use std::fmt::Debug;
 use std::io::{Read, Write};
-use std::net::{SocketAddr, TcpStream, ToSocketAddrs};
-use std::sync::mpsc::{channel, Receiver, Sender};
+use std::net::{SocketAddr, TcpStream};
+use std::sync::mpsc::{channel, Sender};
 use std::time::{Duration, SystemTime};
 use std::{mem, thread};
 
 use blockstack_lib::chainstate::nakamoto::signer_set::NakamotoSigners;
 use blockstack_lib::chainstate::nakamoto::{NakamotoBlock, NakamotoBlockHeader};
-use blockstack_lib::chainstate::stacks::boot::SIGNERS_NAME;
 use blockstack_lib::chainstate::stacks::events::StackerDBChunksEvent;
-use blockstack_lib::util_lib::boot::boot_code_id;
 use clarity::types::chainstate::{ConsensusHash, StacksBlockId, StacksPublicKey, TrieHash};
 use clarity::util::hash::Sha512Trunc256Sum;
 use clarity::util::secp256k1::MessageSignature;
-use clarity::vm::types::QualifiedContractIdentifier;
 use libstackerdb::StackerDBChunkData;
 use stacks_common::bitvec::BitVec;
-use stacks_common::codec::{
-    read_next, read_next_at_most, read_next_exact, write_next, Error as CodecError,
-    StacksMessageCodec,
-};
+use stacks_common::codec::{read_next, StacksMessageCodec};
 use stacks_common::util::secp256k1::Secp256k1PrivateKey;
 use stacks_common::util::sleep_ms;
 
 use crate::events::{BlockProposalData, SignerEvent, SignerEventTrait};
-use crate::v0::messages::{BlockRejection, SignerMessage};
+use crate::v0::messages::SignerMessage;
 use crate::{BlockProposal, Signer, SignerEventReceiver, SignerRunLoop};
 
 /// Simple runloop implementation.  It receives `max_events` events and returns `events` from the
diff --git a/libsigner/src/tests/signer_state.rs b/libsigner/src/tests/signer_state.rs
diff --git a/libsigner/src/v0/messages.rs b/libsigner/src/v0/messages.rs
diff --git a/libsigner/src/v0/signer_state.rs b/libsigner/src/v0/signer_state.rs
diff --git a/stackslib/src/blockstack_cli.rs b/stackslib/src/blockstack_cli.rs
diff --git a/stackslib/src/clarity_cli_main.rs b/stackslib/src/clarity_cli_main.rs
