zecfoundation
/
parity-zcash
mirror of https://github.com/ZcashFoundation/parity-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix warnings

This commit is contained in:
NikVolf 2018-12-29 21:35:21 +03:00
parent 6c858f207c
commit 557985b92d
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storage/src/lib.rs
View File

@ -40,6 +40,7 @@ pub use store::{AsSubstore, Store, SharedStore, CanonStore, ConfigStore};
pub use transaction_meta::TransactionMeta;
pub use transaction_provider::{TransactionProvider, TransactionOutputProvider, TransactionMetaProvider};
pub use nullifier::{Nullifier, NullifierTracker};
pub use tree_state::{TreeState, H32 as H32TreeDim, Dim as TreeDim, RegularTreeState};
/// Epoch tag.
///

26
storage/src/tree_state.rs
View File

@ -76,14 +76,6 @@ pub trait Dim {
fn height() -> u32;
}
pub struct H4;
impl Dim for H4 {
fn height() -> u32 {
4
}
}
pub struct H32;
impl Dim for H32 {
@ -100,7 +92,7 @@ pub struct TreeState<D: Dim> {
}
impl<D: Dim> TreeState<D> {
fn new() -> Self {
pub fn new() -> Self {
TreeState {
_phantom: ::std::marker::PhantomData,
left: None,
@ -109,7 +101,7 @@ impl<D: Dim> TreeState<D> {
}
}
fn append(&mut self, hash: H256) -> Result<(), &'static str> {
pub fn append(&mut self, hash: H256) -> Result<(), &'static str> {
if self.left.is_none() {
self.left = Some(hash);
} else if self.right.is_none() {
@ -139,7 +131,7 @@ impl<D: Dim> TreeState<D> {
Ok(())
}
fn root(&self) -> H256 {
pub fn root(&self) -> H256 {
let left = self.left.as_ref().unwrap_or(&EMPTY_ROOTS[0]);
let right = self.right.as_ref().unwrap_or(&EMPTY_ROOTS[0]);
@ -156,7 +148,6 @@ impl<D: Dim> TreeState<D> {
}
}
pub type TestTreeState = TreeState<H4>;
pub type RegularTreeState = TreeState<H32>;
impl<D: Dim> serialization::Serializable for TreeState<D> {
@ -184,7 +175,16 @@ impl<D: Dim> serialization::Deserializable for TreeState<D> {
mod tests {
use super::*;
use EpochTag;
pub struct H4;
impl Dim for H4 {
fn height() -> u32 {
4
}
}
type TestTreeState = TreeState<H4>;
pub struct H1;