diff --git a/chain/chain/src/chain.rs b/chain/chain/src/chain.rs index dc8df9d3f36..b38dc32a976 100644 --- a/chain/chain/src/chain.rs +++ b/chain/chain/src/chain.rs @@ -56,11 +56,11 @@ use near_primitives::sharding::{ ShardChunkHeader, ShardInfo, ShardProof, StateSyncInfo, }; use near_primitives::state_part::PartId; -use near_primitives::static_clock::StaticClock; -use near_primitives::syncing::{ +use near_primitives::state_sync::{ get_num_state_parts, ReceiptProofResponse, RootProof, ShardStateSyncResponseHeader, ShardStateSyncResponseHeaderV1, ShardStateSyncResponseHeaderV2, StateHeaderKey, StatePartKey, }; +use near_primitives::static_clock::StaticClock; use near_primitives::transaction::{ExecutionOutcomeWithIdAndProof, SignedTransaction}; use near_primitives::types::chunk_extra::ChunkExtra; use near_primitives::types::{ diff --git a/chain/chain/src/resharding.rs b/chain/chain/src/resharding.rs index 83092ad27d3..f5f49e6c379 100644 --- a/chain/chain/src/resharding.rs +++ b/chain/chain/src/resharding.rs @@ -13,7 +13,7 @@ use near_primitives::hash::CryptoHash; use near_primitives::shard_layout::{account_id_to_shard_uid, ShardLayout}; use near_primitives::state::FlatStateValue; use near_primitives::state_part::PartId; -use near_primitives::syncing::get_num_state_parts; +use near_primitives::state_sync::get_num_state_parts; use near_primitives::types::chunk_extra::ChunkExtra; use near_primitives::types::{AccountId, ShardId, StateRoot}; use near_store::flat::{ diff --git a/chain/chain/src/store.rs b/chain/chain/src/store.rs index 7f2d51d9757..2ba08539af4 100644 --- a/chain/chain/src/store.rs +++ b/chain/chain/src/store.rs @@ -23,7 +23,7 @@ use near_primitives::sharding::{ ChunkHash, EncodedShardChunk, PartialEncodedChunk, ReceiptProof, ShardChunk, ShardChunkHeader, StateSyncInfo, }; -use near_primitives::syncing::{ +use near_primitives::state_sync::{ get_num_state_parts, ReceiptProofResponse, ShardStateSyncResponseHeader, StateHeaderKey, StatePartKey, StateSyncDumpProgress, }; diff --git a/chain/chain/src/store_validator.rs b/chain/chain/src/store_validator.rs index 07fd1407581..46182754409 100644 --- a/chain/chain/src/store_validator.rs +++ b/chain/chain/src/store_validator.rs @@ -17,7 +17,7 @@ use near_primitives::epoch_manager::epoch_info::EpochInfo; use near_primitives::epoch_manager::AGGREGATOR_KEY; use near_primitives::hash::CryptoHash; use near_primitives::sharding::{ChunkHash, ShardChunk, StateSyncInfo}; -use near_primitives::syncing::{ShardStateSyncResponseHeader, StateHeaderKey, StatePartKey}; +use near_primitives::state_sync::{ShardStateSyncResponseHeader, StateHeaderKey, StatePartKey}; use near_primitives::transaction::ExecutionOutcomeWithProof; use near_primitives::types::chunk_extra::ChunkExtra; use near_primitives::types::{AccountId, BlockHeight, EpochId}; diff --git a/chain/chain/src/store_validator/validate.rs b/chain/chain/src/store_validator/validate.rs index 0f2e2d8184e..140d5660eca 100644 --- a/chain/chain/src/store_validator/validate.rs +++ b/chain/chain/src/store_validator/validate.rs @@ -6,7 +6,7 @@ use near_primitives::epoch_manager::epoch_info::EpochInfo; use near_primitives::hash::CryptoHash; use near_primitives::shard_layout::{get_block_shard_uid, ShardUId}; use near_primitives::sharding::{ChunkHash, ShardChunk, StateSyncInfo}; -use near_primitives::syncing::{ +use near_primitives::state_sync::{ get_num_state_parts, ShardStateSyncResponseHeader, StateHeaderKey, StatePartKey, }; use near_primitives::transaction::{ExecutionOutcomeWithProof, SignedTransaction}; diff --git a/chain/client/src/debug.rs b/chain/client/src/debug.rs index 87a86ae3149..79b2276da8a 100644 --- a/chain/client/src/debug.rs +++ b/chain/client/src/debug.rs @@ -18,11 +18,11 @@ use near_client_primitives::{ use near_epoch_manager::EpochManagerAdapter; use near_o11y::{handler_debug_span, log_assert, OpenTelemetrySpanExt, WithSpanContext}; use near_performance_metrics_macros::perf; -use near_primitives::syncing::get_num_state_parts; +use near_primitives::state_sync::get_num_state_parts; use near_primitives::types::{AccountId, BlockHeight, ShardId, ValidatorInfoIdentifier}; use near_primitives::{ hash::CryptoHash, - syncing::{ShardStateSyncResponseHeader, StateHeaderKey}, + state_sync::{ShardStateSyncResponseHeader, StateHeaderKey}, types::EpochId, views::ValidatorInfo, }; diff --git a/chain/client/src/sync/state.rs b/chain/client/src/sync/state.rs index b7a0e73c9ec..e838baf9125 100644 --- a/chain/client/src/sync/state.rs +++ b/chain/client/src/sync/state.rs @@ -46,8 +46,8 @@ use near_network::types::{ use near_primitives::hash::CryptoHash; use near_primitives::shard_layout::ShardUId; use near_primitives::state_part::PartId; +use near_primitives::state_sync::{get_num_state_parts, ShardStateSyncResponse}; use near_primitives::static_clock::StaticClock; -use near_primitives::syncing::{get_num_state_parts, ShardStateSyncResponse}; use near_primitives::types::{AccountId, EpochHeight, EpochId, ShardId, StateRoot}; use rand::seq::SliceRandom; use rand::{thread_rng, Rng}; @@ -1400,7 +1400,7 @@ mod test { use near_epoch_manager::EpochManagerAdapter; use near_network::test_utils::MockPeerManagerAdapter; use near_primitives::{ - syncing::{ShardStateSyncResponseHeader, ShardStateSyncResponseV2}, + state_sync::{ShardStateSyncResponseHeader, ShardStateSyncResponseV2}, test_utils::TestBlockBuilder, types::EpochId, }; diff --git a/chain/client/src/sync_jobs_actor.rs b/chain/client/src/sync_jobs_actor.rs index 8d7866c9bf9..f2b0a45a844 100644 --- a/chain/client/src/sync_jobs_actor.rs +++ b/chain/client/src/sync_jobs_actor.rs @@ -9,7 +9,7 @@ use near_chain::Chain; use near_o11y::{handler_debug_span, OpenTelemetrySpanExt, WithSpanContext, WithSpanContextExt}; use near_performance_metrics_macros::perf; use near_primitives::state_part::PartId; -use near_primitives::syncing::StatePartKey; +use near_primitives::state_sync::StatePartKey; use near_primitives::types::ShardId; use near_store::DBCol; diff --git a/chain/client/src/view_client.rs b/chain/client/src/view_client.rs index fbef4f43428..5903c798587 100644 --- a/chain/client/src/view_client.rs +++ b/chain/client/src/view_client.rs @@ -42,11 +42,11 @@ use near_primitives::merkle::{merklize, PartialMerkleTree}; use near_primitives::network::AnnounceAccount; use near_primitives::receipt::Receipt; use near_primitives::sharding::ShardChunk; -use near_primitives::static_clock::StaticClock; -use near_primitives::syncing::{ +use near_primitives::state_sync::{ ShardStateSyncResponse, ShardStateSyncResponseHeader, ShardStateSyncResponseV1, ShardStateSyncResponseV2, }; +use near_primitives::static_clock::StaticClock; use near_primitives::types::{ AccountId, BlockHeight, BlockId, BlockReference, EpochReference, Finality, MaybeBlockId, ShardId, SyncCheckpoint, TransactionOrReceiptId, ValidatorInfoIdentifier, diff --git a/chain/network/src/network_protocol/mod.rs b/chain/network/src/network_protocol/mod.rs index 03a46de6af7..824adddd904 100644 --- a/chain/network/src/network_protocol/mod.rs +++ b/chain/network/src/network_protocol/mod.rs @@ -35,7 +35,7 @@ use near_primitives::network::{AnnounceAccount, PeerId}; use near_primitives::sharding::{ ChunkHash, PartialEncodedChunk, PartialEncodedChunkPart, ReceiptProof, ShardChunkHeader, }; -use near_primitives::syncing::{ShardStateSyncResponse, ShardStateSyncResponseV1}; +use near_primitives::state_sync::{ShardStateSyncResponse, ShardStateSyncResponseV1}; use near_primitives::transaction::SignedTransaction; use near_primitives::types::AccountId; use near_primitives::types::{BlockHeight, ShardId}; diff --git a/chain/network/src/testonly/fake_client.rs b/chain/network/src/testonly/fake_client.rs index 625ea4c6352..5d2b0d00c96 100644 --- a/chain/network/src/testonly/fake_client.rs +++ b/chain/network/src/testonly/fake_client.rs @@ -9,7 +9,7 @@ use near_primitives::challenge::Challenge; use near_primitives::hash::CryptoHash; use near_primitives::network::{AnnounceAccount, PeerId}; use near_primitives::sharding::{ChunkHash, PartialEncodedChunkPart}; -use near_primitives::syncing::{ShardStateSyncResponse, ShardStateSyncResponseV2}; +use near_primitives::state_sync::{ShardStateSyncResponse, ShardStateSyncResponseV2}; use near_primitives::transaction::SignedTransaction; use near_primitives::types::{AccountId, EpochId, ShardId}; use near_primitives::views::FinalExecutionOutcomeView; diff --git a/core/primitives/src/lib.rs b/core/primitives/src/lib.rs index ebf2bcaf792..b7fca043fa0 100644 --- a/core/primitives/src/lib.rs +++ b/core/primitives/src/lib.rs @@ -23,8 +23,8 @@ pub mod signable_message; pub mod state; pub mod state_part; pub mod state_record; +pub mod state_sync; pub mod static_clock; -pub mod syncing; pub mod telemetry; pub mod test_utils; pub mod transaction; diff --git a/core/primitives/src/syncing.rs b/core/primitives/src/state_sync.rs similarity index 99% rename from core/primitives/src/syncing.rs rename to core/primitives/src/state_sync.rs index 7e2bf846c97..03ff371f128 100644 --- a/core/primitives/src/syncing.rs +++ b/core/primitives/src/state_sync.rs @@ -248,7 +248,7 @@ pub enum StateSyncDumpProgress { #[cfg(test)] mod tests { - use crate::syncing::{get_num_state_parts, STATE_PART_MEMORY_LIMIT}; + use crate::state_sync::{get_num_state_parts, STATE_PART_MEMORY_LIMIT}; #[test] fn test_get_num_state_parts() { diff --git a/integration-tests/src/tests/client/process_blocks.rs b/integration-tests/src/tests/client/process_blocks.rs index cc9f2eadfaa..da1eef236bf 100644 --- a/integration-tests/src/tests/client/process_blocks.rs +++ b/integration-tests/src/tests/client/process_blocks.rs @@ -52,7 +52,7 @@ use near_primitives::sharding::{ ShardChunkHeaderV3, }; use near_primitives::state_part::PartId; -use near_primitives::syncing::{get_num_state_parts, StatePartKey}; +use near_primitives::state_sync::{get_num_state_parts, StatePartKey}; use near_primitives::test_utils::create_test_signer; use near_primitives::test_utils::TestBlockBuilder; use near_primitives::transaction::{ diff --git a/integration-tests/src/tests/client/state_dump.rs b/integration-tests/src/tests/client/state_dump.rs index 4d4c211d618..5b102fcb95c 100644 --- a/integration-tests/src/tests/client/state_dump.rs +++ b/integration-tests/src/tests/client/state_dump.rs @@ -14,8 +14,8 @@ use near_primitives::block::Tip; use near_primitives::shard_layout::ShardUId; use near_primitives::state::FlatStateValue; use near_primitives::state_part::PartId; -use near_primitives::syncing::get_num_state_parts; -use near_primitives::syncing::StatePartKey; +use near_primitives::state_sync::get_num_state_parts; +use near_primitives::state_sync::StatePartKey; use near_primitives::transaction::SignedTransaction; use near_primitives::types::BlockHeight; use near_primitives::views::{QueryRequest, QueryResponseKind}; diff --git a/integration-tests/src/tests/client/sync_state_nodes.rs b/integration-tests/src/tests/client/sync_state_nodes.rs index 5580eac6d55..39b73a27156 100644 --- a/integration-tests/src/tests/client/sync_state_nodes.rs +++ b/integration-tests/src/tests/client/sync_state_nodes.rs @@ -15,7 +15,7 @@ use near_o11y::testonly::{init_integration_logger, init_test_logger}; use near_o11y::WithSpanContextExt; use near_primitives::shard_layout::ShardUId; use near_primitives::state_part::PartId; -use near_primitives::syncing::{get_num_state_parts, StatePartKey}; +use near_primitives::state_sync::{get_num_state_parts, StatePartKey}; use near_primitives::transaction::SignedTransaction; use near_primitives::utils::MaybeValidated; use near_primitives_core::types::ShardId; diff --git a/nearcore/src/state_sync.rs b/nearcore/src/state_sync.rs index 0e05a2a2f84..b3596b0aa8e 100644 --- a/nearcore/src/state_sync.rs +++ b/nearcore/src/state_sync.rs @@ -13,7 +13,7 @@ use near_epoch_manager::shard_tracker::ShardTracker; use near_epoch_manager::EpochManagerAdapter; use near_primitives::hash::CryptoHash; use near_primitives::state_part::PartId; -use near_primitives::syncing::{get_num_state_parts, StatePartKey, StateSyncDumpProgress}; +use near_primitives::state_sync::{get_num_state_parts, StatePartKey, StateSyncDumpProgress}; use near_primitives::types::{AccountId, EpochHeight, EpochId, ShardId, StateRoot}; use near_store::DBCol; use rand::{thread_rng, Rng}; diff --git a/tools/mock-node/src/setup.rs b/tools/mock-node/src/setup.rs index 6f2dca38ebe..acacde0e935 100644 --- a/tools/mock-node/src/setup.rs +++ b/tools/mock-node/src/setup.rs @@ -13,7 +13,7 @@ use near_network::tcp; use near_network::types::PeerInfo; use near_primitives::network::PeerId; use near_primitives::state_part::PartId; -use near_primitives::syncing::get_num_state_parts; +use near_primitives::state_sync::get_num_state_parts; use near_primitives::types::{BlockHeight, ShardId}; use near_store::test_utils::create_test_store; use nearcore::{NearConfig, NightshadeRuntime}; diff --git a/tools/state-viewer/src/apply_chunk.rs b/tools/state-viewer/src/apply_chunk.rs index 16dbedb36a5..7ecb175a25f 100644 --- a/tools/state-viewer/src/apply_chunk.rs +++ b/tools/state-viewer/src/apply_chunk.rs @@ -10,7 +10,7 @@ use near_primitives::merkle::combine_hash; use near_primitives::receipt::Receipt; use near_primitives::shard_layout; use near_primitives::sharding::{ChunkHash, ReceiptProof}; -use near_primitives::syncing::ReceiptProofResponse; +use near_primitives::state_sync::ReceiptProofResponse; use near_primitives::types::{BlockHeight, ShardId}; use near_primitives_core::hash::hash; use near_primitives_core::types::Gas; diff --git a/tools/state-viewer/src/scan_db.rs b/tools/state-viewer/src/scan_db.rs index f7c1b747c26..bd96193c106 100644 --- a/tools/state-viewer/src/scan_db.rs +++ b/tools/state-viewer/src/scan_db.rs @@ -9,7 +9,7 @@ use near_primitives::receipt::Receipt; use near_primitives::shard_layout::{get_block_shard_uid_rev, ShardUId}; use near_primitives::sharding::{ChunkHash, ReceiptProof, ShardChunk, StateSyncInfo}; use near_primitives::state::FlatStateValue; -use near_primitives::syncing::{ +use near_primitives::state_sync::{ ShardStateSyncResponseHeader, StateHeaderKey, StatePartKey, StateSyncDumpProgress, }; use near_primitives::transaction::{ExecutionOutcomeWithProof, SignedTransaction}; diff --git a/tools/state-viewer/src/state_parts.rs b/tools/state-viewer/src/state_parts.rs index c3b83371784..26860af4de7 100644 --- a/tools/state-viewer/src/state_parts.rs +++ b/tools/state-viewer/src/state_parts.rs @@ -12,7 +12,7 @@ use near_primitives::challenge::PartialState; use near_primitives::epoch_manager::epoch_info::EpochInfo; use near_primitives::state_part::PartId; use near_primitives::state_record::StateRecord; -use near_primitives::syncing::get_num_state_parts; +use near_primitives::state_sync::get_num_state_parts; use near_primitives::types::{EpochId, StateRoot}; use near_primitives_core::hash::CryptoHash; use near_primitives_core::types::{BlockHeight, EpochHeight, ShardId};