reorganize modules for consistency

zebra-state/src/lib.rs

@@ -14,16 +14,12 @@ mod error;
 mod request;
 mod response;
 mod service;
-mod sled_state;
 mod util;
 
 // TODO: move these to integration tests.
 #[cfg(test)]
 mod tests;
 
-use service::QueuedBlock;
-use sled_state::FinalizedState;
-
 pub use config::Config;
 pub use constants::MAX_BLOCK_REORG_HEIGHT;
 pub use error::{BoxError, CloneError, CommitBlockError, ValidateContextError};

zebra-state/src/service.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use futures::future::FutureExt;
-use memory_state::{NonFinalizedState, QueuedBlocks};
+use non_finalized_state::{NonFinalizedState, QueuedBlocks};
 use tokio::sync::oneshot;
 use tower::{util::BoxService, Service};
 use tracing::instrument;
@@ -21,12 +21,15 @@ use zebra_chain::{
 };
 
 use crate::{
-    request::HashOrHeight, BoxError, CommitBlockError, Config, FinalizedState, Request, Response,
+    request::HashOrHeight, BoxError, CommitBlockError, Config, Request, Response,
     ValidateContextError,
 };
 
+use self::finalized_state::FinalizedState;
+
 mod check;
-mod memory_state;
+mod finalized_state;
+mod non_finalized_state;
 #[cfg(test)]
 mod tests;
 mod utxo;

zebra-state/src/service/finalized_state.rs

@@ -1,5 +1,7 @@
 //! The primary implementation of the `zebra_state::Service` built upon sled
 
+mod sled_format;
+
 use std::{collections::HashMap, convert::TryInto, sync::Arc};
 
 use zebra_chain::transparent;
@@ -9,13 +11,11 @@ use zebra_chain::{
     transaction::{self, Transaction},
 };
 
-use crate::{BoxError, Config, HashOrHeight, QueuedBlock};
+use crate::{BoxError, Config, HashOrHeight};
 
-mod sled_format;
+use self::sled_format::{FromSled, IntoSled, SledDeserialize, SledSerialize, TransactionLocation};
 
-use sled_format::{FromSled, IntoSled, SledDeserialize, SledSerialize};
+use super::QueuedBlock;
-
-use self::sled_format::TransactionLocation;
 
 /// The finalized part of the chain state, stored in sled.
 ///

zebra-state/src/service/memory_state.rs

@@ -1,11 +0,0 @@
-//! Non-finalized chain state management as defined by [RFC0005]
-//!
-//! [RFC0005]: https://zebra.zfnd.org/dev/rfcs/0005-state-updates.html
-
-mod chain;
-mod non_finalized_state;
-mod queued_blocks;
-
-use chain::Chain;
-pub use non_finalized_state::NonFinalizedState;
-pub use queued_blocks::QueuedBlocks;

zebra-state/src/service/non_finalized_state.rs

@@ -1,3 +1,12 @@
+//! Non-finalized chain state management as defined by [RFC0005]
+//!
+//! [RFC0005]: https://zebra.zfnd.org/dev/rfcs/0005-state-updates.html
+
+mod chain;
+mod queued_blocks;
+
+pub use queued_blocks::QueuedBlocks;
+
 use std::{collections::BTreeSet, mem, ops::Deref, sync::Arc};
 
 use zebra_chain::{
@@ -8,7 +17,7 @@ use zebra_chain::{
 
 use crate::request::HashOrHeight;
 
-use super::Chain;
+use self::chain::Chain;
 
 /// The state of the chains in memory, incuding queued blocks.
 #[derive(Default)]