[Storage Service] Split up logic into different files/modules.

state-sync/aptos-data-client/src/aptosnet/logging.rs

@@ -5,7 +5,7 @@ use crate::Error;
 use aptos_config::network_id::PeerNetworkId;
 use aptos_logger::Schema;
 use serde::Serialize;
-use storage_service_types::StorageServiceRequest;
+use storage_service_types::requests::StorageServiceRequest;
 
 #[derive(Schema)]
 pub struct LogSchema<'a> {

state-sync/aptos-data-client/src/aptosnet/mod.rs

@@ -36,12 +36,13 @@ use network::{
 use rand::seq::SliceRandom;
 use std::{convert::TryFrom, fmt, sync::Arc, time::Duration};
 use storage_service_client::StorageServiceClient;
-use storage_service_types::{
-    Epoch, EpochEndingLedgerInfoRequest, NewTransactionOutputsWithProofRequest,
-    NewTransactionsWithProofRequest, StateValuesWithProofRequest, StorageServerSummary,
-    StorageServiceRequest, StorageServiceResponse, TransactionOutputsWithProofRequest,
-    TransactionsWithProofRequest,
+use storage_service_types::requests::{
+    EpochEndingLedgerInfoRequest, NewTransactionOutputsWithProofRequest,
+    NewTransactionsWithProofRequest, StateValuesWithProofRequest, StorageServiceRequest,
+    TransactionOutputsWithProofRequest, TransactionsWithProofRequest,
 };
+use storage_service_types::responses::{StorageServerSummary, StorageServiceResponse};
+use storage_service_types::Epoch;
 use tokio::{runtime::Handle, task::JoinHandle};
 
 mod logging;

state-sync/aptos-data-client/src/aptosnet/state.rs

@@ -18,7 +18,8 @@ use std::{
     collections::{HashMap, HashSet},
     sync::Arc,
 };
-use storage_service_types::{StorageServerSummary, StorageServiceRequest};
+use storage_service_types::requests::StorageServiceRequest;
+use storage_service_types::responses::StorageServerSummary;
 
 /// Scores for peer rankings based on preferences and behavior.
 const MAX_SCORE: f64 = 100.0;

state-sync/aptos-data-client/src/aptosnet/tests.rs

@@ -33,12 +33,14 @@ use std::{
 };
 use storage_service_client::{StorageServiceClient, StorageServiceNetworkSender};
 use storage_service_server::network::{NetworkRequest, ResponseSender};
-use storage_service_types::{
-    CompleteDataRange, DataSummary, NewTransactionOutputsWithProofRequest,
-    NewTransactionsWithProofRequest, ProtocolMetadata, StorageServerSummary, StorageServiceError,
-    StorageServiceMessage, StorageServiceRequest, StorageServiceResponse,
+use storage_service_types::requests::{
+    NewTransactionOutputsWithProofRequest, NewTransactionsWithProofRequest, StorageServiceRequest,
     TransactionOutputsWithProofRequest, TransactionsWithProofRequest,
 };
+use storage_service_types::responses::{
+    CompleteDataRange, DataSummary, ProtocolMetadata, StorageServerSummary, StorageServiceResponse,
+};
+use storage_service_types::{StorageServiceError, StorageServiceMessage};
 
 fn mock_ledger_info(version: Version) -> LedgerInfoWithSignatures {
     LedgerInfoWithSignatures::new(

state-sync/aptos-data-client/src/lib.rs

@@ -13,8 +13,8 @@ use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use std::fmt;
 use std::fmt::Display;
-use storage_service::UnexpectedResponseError;
-use storage_service_types::{self as storage_service, CompleteDataRange, Epoch};
+use storage_service_types::responses::CompleteDataRange;
+use storage_service_types::Epoch;
 use thiserror::Error;
 
 pub type ResponseId = u64;
@@ -55,10 +55,9 @@ impl Error {
     }
 }
 
-// TODO(philiphayes): better error wrapping
-impl From<UnexpectedResponseError> for Error {
-    fn from(err: UnexpectedResponseError) -> Self {
-        Self::InvalidResponse(err.0)
+impl From<storage_service_types::responses::Error> for Error {
+    fn from(error: storage_service_types::responses::Error) -> Self {
+        Self::InvalidResponse(error.to_string())
     }
 }
 

state-sync/state-sync-v2/data-streaming-service/src/tests/data_stream.rs

@@ -29,7 +29,7 @@ use aptos_types::{ledger_info::LedgerInfoWithSignatures, transaction::Version};
 use claim::{assert_err, assert_ge, assert_none, assert_ok};
 use futures::{FutureExt, StreamExt};
 use std::{sync::Arc, time::Duration};
-use storage_service_types::CompleteDataRange;
+use storage_service_types::responses::CompleteDataRange;
 use tokio::time::timeout;
 
 #[tokio::test]

state-sync/state-sync-v2/data-streaming-service/src/tests/stream_engine.rs

@@ -12,7 +12,7 @@ use aptos_data_client::{GlobalDataSummary, OptimalChunkSizes, ResponsePayload};
 use aptos_id_generator::U64IdGenerator;
 use claim::{assert_matches, assert_ok};
 use std::{cmp, sync::Arc};
-use storage_service_types::CompleteDataRange;
+use storage_service_types::responses::CompleteDataRange;
 
 #[test]
 fn test_create_epoch_ending_requests() {

state-sync/state-sync-v2/data-streaming-service/src/tests/utils.rs

@@ -34,7 +34,8 @@ use std::{
     thread,
     time::Duration,
 };
-use storage_service_types::{CompleteDataRange, Epoch};
+use storage_service_types::responses::CompleteDataRange;
+use storage_service_types::Epoch;
 use tokio::time::timeout;
 
 /// The number of state values held at any version

state-sync/state-sync-v2/state-sync-driver/src/tests/utils.rs

@@ -38,7 +38,7 @@ use futures::StreamExt;
 use mempool_notifications::{CommittedTransaction, MempoolNotificationListener};
 use move_deps::move_core_types::language_storage::TypeTag;
 use std::collections::BTreeMap;
-use storage_service_types::CompleteDataRange;
+use storage_service_types::responses::CompleteDataRange;
 
 /// Creates a new data stream listener and notification sender pair
 pub fn create_data_stream_listener() -> (Sender<(), DataNotification>, DataStreamListener) {

state-sync/storage-service/client/src/lib.rs

@@ -19,9 +19,9 @@ use network::{
     ProtocolId,
 };
 use std::{sync::Arc, time::Duration};
-use storage_service_types::{
-    StorageServiceError, StorageServiceMessage, StorageServiceRequest, StorageServiceResponse,
-};
+use storage_service_types::requests::StorageServiceRequest;
+use storage_service_types::responses::StorageServiceResponse;
+use storage_service_types::{StorageServiceError, StorageServiceMessage};
 use thiserror::Error;
 
 #[derive(Debug, Error)]

state-sync/storage-service/server/src/lib.rs

@@ -31,12 +31,15 @@ use std::{
     time::{Duration, Instant},
 };
 use storage_interface::DbReader;
-use storage_service_types::{
-    CompleteDataRange, DataSummary, EpochEndingLedgerInfoRequest, ProtocolMetadata, Result,
-    ServerProtocolVersion, StateValuesWithProofRequest, StorageServerSummary, StorageServiceError,
-    StorageServiceRequest, StorageServiceResponse, TransactionOutputsWithProofRequest,
-    TransactionsWithProofRequest,
+use storage_service_types::requests::{
+    EpochEndingLedgerInfoRequest, StateValuesWithProofRequest, StorageServiceRequest,
+    TransactionOutputsWithProofRequest, TransactionsWithProofRequest,
 };
+use storage_service_types::responses::{
+    CompleteDataRange, DataSummary, ProtocolMetadata, ServerProtocolVersion, StorageServerSummary,
+    StorageServiceResponse,
+};
+use storage_service_types::{Result, StorageServiceError};
 use thiserror::Error;
 use tokio::runtime::Handle;
 

state-sync/storage-service/server/src/logging.rs

@@ -4,7 +4,7 @@
 use crate::Error;
 use aptos_logger::Schema;
 use serde::Serialize;
-use storage_service_types::StorageServiceRequest;
+use storage_service_types::requests::StorageServiceRequest;
 
 #[derive(Schema)]
 pub struct LogSchema<'a> {

state-sync/storage-service/server/src/network.rs

@@ -20,9 +20,9 @@ use std::{
     pin::Pin,
     task::{Context, Poll},
 };
-use storage_service_types::{
-    Result, StorageServiceMessage, StorageServiceRequest, StorageServiceResponse,
-};
+use storage_service_types::requests::StorageServiceRequest;
+use storage_service_types::responses::StorageServiceResponse;
+use storage_service_types::{Result, StorageServiceMessage};
 
 pub fn network_endpoint_config(storage_config: StorageServiceConfig) -> AppConfig {
     let max_network_channel_size = storage_config.max_network_channel_size as usize;

state-sync/storage-service/server/src/tests.rs

@@ -51,13 +51,16 @@ use network::{
 };
 use std::{collections::BTreeMap, sync::Arc, time::Duration};
 use storage_interface::{DbReader, ExecutedTrees, Order, StartupInfo};
-use storage_service_types::{
-    CompleteDataRange, DataSummary, Epoch, EpochEndingLedgerInfoRequest,
-    NewTransactionOutputsWithProofRequest, NewTransactionsWithProofRequest, ProtocolMetadata,
-    ServerProtocolVersion, StateValuesWithProofRequest, StorageServerSummary, StorageServiceError,
-    StorageServiceMessage, StorageServiceRequest, StorageServiceResponse,
+use storage_service_types::requests::{
+    EpochEndingLedgerInfoRequest, NewTransactionOutputsWithProofRequest,
+    NewTransactionsWithProofRequest, StateValuesWithProofRequest, StorageServiceRequest,
     TransactionOutputsWithProofRequest, TransactionsWithProofRequest,
 };
+use storage_service_types::responses::{
+    CompleteDataRange, DataSummary, ProtocolMetadata, ServerProtocolVersion, StorageServerSummary,
+    StorageServiceResponse,
+};
+use storage_service_types::{Epoch, StorageServiceError, StorageServiceMessage};
 use tokio::time::timeout;
 
 /// Various test constants for storage