From a122a547be55d10c2c82e6bf5e49beb39cbb62d7 Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Mon, 16 Nov 2020 16:05:35 -0800 Subject: [PATCH] reorganize modules for consistency --- zebra-state/src/lib.rs | 4 ---- zebra-state/src/service.rs | 9 ++++++--- .../src/{sled_state.rs => service/finalized_state.rs} | 10 +++++----- .../finalized_state}/sled_format.rs | 0 zebra-state/src/service/memory_state.rs | 11 ----------- .../service/{memory_state => }/non_finalized_state.rs | 11 ++++++++++- .../{memory_state => non_finalized_state}/chain.rs | 0 .../queued_blocks.rs | 0 8 files changed, 21 insertions(+), 24 deletions(-) rename zebra-state/src/{sled_state.rs => service/finalized_state.rs} (98%) rename zebra-state/src/{sled_state => service/finalized_state}/sled_format.rs (100%) delete mode 100644 zebra-state/src/service/memory_state.rs rename zebra-state/src/service/{memory_state => }/non_finalized_state.rs (98%) rename zebra-state/src/service/{memory_state => non_finalized_state}/chain.rs (100%) rename zebra-state/src/service/{memory_state => non_finalized_state}/queued_blocks.rs (100%) diff --git a/zebra-state/src/lib.rs b/zebra-state/src/lib.rs index 42fd4cea..cdf6c339 100644 --- a/zebra-state/src/lib.rs +++ b/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}; diff --git a/zebra-state/src/service.rs b/zebra-state/src/service.rs index a100eaf9..fe7d05c9 100644 --- a/zebra-state/src/service.rs +++ b/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; diff --git a/zebra-state/src/sled_state.rs b/zebra-state/src/service/finalized_state.rs similarity index 98% rename from zebra-state/src/sled_state.rs rename to zebra-state/src/service/finalized_state.rs index 1d211e86..472022f9 100644 --- a/zebra-state/src/sled_state.rs +++ b/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 self::sled_format::TransactionLocation; +use super::QueuedBlock; /// The finalized part of the chain state, stored in sled. /// diff --git a/zebra-state/src/sled_state/sled_format.rs b/zebra-state/src/service/finalized_state/sled_format.rs similarity index 100% rename from zebra-state/src/sled_state/sled_format.rs rename to zebra-state/src/service/finalized_state/sled_format.rs diff --git a/zebra-state/src/service/memory_state.rs b/zebra-state/src/service/memory_state.rs deleted file mode 100644 index 88926220..00000000 --- a/zebra-state/src/service/memory_state.rs +++ /dev/null @@ -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; diff --git a/zebra-state/src/service/memory_state/non_finalized_state.rs b/zebra-state/src/service/non_finalized_state.rs similarity index 98% rename from zebra-state/src/service/memory_state/non_finalized_state.rs rename to zebra-state/src/service/non_finalized_state.rs index f4bcbe1e..2444e7e1 100644 --- a/zebra-state/src/service/memory_state/non_finalized_state.rs +++ b/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)] diff --git a/zebra-state/src/service/memory_state/chain.rs b/zebra-state/src/service/non_finalized_state/chain.rs similarity index 100% rename from zebra-state/src/service/memory_state/chain.rs rename to zebra-state/src/service/non_finalized_state/chain.rs diff --git a/zebra-state/src/service/memory_state/queued_blocks.rs b/zebra-state/src/service/non_finalized_state/queued_blocks.rs similarity index 100% rename from zebra-state/src/service/memory_state/queued_blocks.rs rename to zebra-state/src/service/non_finalized_state/queued_blocks.rs