refactor: move core::util to core::test_util

Author: obycode

stackslib/src/core/mod.rs

@@ -32,10 +32,10 @@ use crate::chainstate::burn::ConsensusHash;
 pub mod mempool;
 pub mod nonce_cache;
 
+#[cfg(any(test, feature = "testing"))]
+pub mod test_util;
 #[cfg(test)]
 pub mod tests;
-#[cfg(any(test, feature = "testing"))]
-pub mod util;
 
 use std::cmp::Ordering;
 pub type StacksEpoch = GenericStacksEpoch<ExecutionCost>;

stackslib/src/core/util.rs renamed to stackslib/src/core/test_util.rs

@@ -65,7 +65,7 @@ use crate::core::mempool::{
     db_get_all_nonces, MemPoolSyncData, MemPoolWalkSettings, MemPoolWalkTxTypes, TxTag,
     BLOOM_COUNTER_DEPTH, BLOOM_COUNTER_ERROR_RATE, MAX_BLOOM_COUNTER_TXS,
 };
-use crate::core::util::{insert_tx_in_mempool, make_stacks_transfer, to_addr};
+use crate::core::test_util::{insert_tx_in_mempool, make_stacks_transfer, to_addr};
 use crate::core::{FIRST_BURNCHAIN_CONSENSUS_HASH, FIRST_STACKS_BLOCK_HASH};
 use crate::net::Error as NetError;
 use crate::util_lib::bloom::test::setup_bloom_counter;

stackslib/src/core/tests/mod.rs

@@ -43,7 +43,7 @@ use crate::chainstate::stacks::{
     TransactionPayload, TransactionVersion,
 };
 use crate::clarity::vm::types::StacksAddressExtensions;
-use crate::core::util::to_addr;
+use crate::core::test_util::to_addr;
 use crate::net::api::gettenureinfo::RPCGetTenureInfo;
 use crate::net::download::nakamoto::{TenureStartEnd, WantedTenure, *};
 use crate::net::inv::nakamoto::NakamotoTenureInv;

stackslib/src/net/tests/download/nakamoto.rs

@@ -43,7 +43,7 @@ use crate::chainstate::stacks::{
     TransactionAuth, TransactionPayload, TransactionVersion,
 };
 use crate::clarity::vm::types::StacksAddressExtensions;
-use crate::core::util::to_addr;
+use crate::core::test_util::to_addr;
 use crate::core::StacksEpochExtension;
 use crate::net::inv::nakamoto::{InvGenerator, NakamotoInvStateMachine, NakamotoTenureInv};
 use crate::net::neighbors::comms::NeighborComms;

stackslib/src/net/tests/inv/nakamoto.rs

@@ -32,7 +32,7 @@ use crate::burnchains::*;
 use crate::chainstate::nakamoto::coordinator::tests::make_token_transfer;
 use crate::chainstate::stacks::test::*;
 use crate::chainstate::stacks::*;
-use crate::core::util::to_addr;
+use crate::core::test_util::to_addr;
 use crate::core::StacksEpochExtension;
 use crate::net::atlas::*;
 use crate::net::codec::*;