diff --git a/firewood/src/merkle/node.rs b/firewood/src/merkle/node.rs index 5ce90ac6b..43fbeafa1 100644 --- a/firewood/src/merkle/node.rs +++ b/firewood/src/merkle/node.rs @@ -22,8 +22,8 @@ mod leaf; mod partial_path; pub use branch::{BranchNode, MAX_CHILDREN, SIZE as BRANCH_NODE_SIZE}; -pub use extension::{ExtNode, SIZE as EXTENSION_NODE_SIZE}; -pub use leaf::LeafNode; +pub use extension::ExtNode; +pub use leaf::{LeafNode, SIZE as LEAF_NODE_SIZE}; pub use partial_path::PartialPath; use crate::merkle::to_nibble_array; @@ -89,7 +89,7 @@ impl NodeType { let items: Vec>> = bincode::DefaultOptions::new().deserialize(buf)?; match items.len() { - EXTENSION_NODE_SIZE => { + LEAF_NODE_SIZE => { let mut items = items.into_iter(); let decoded_key: Vec = items.next().unwrap().decode()?; diff --git a/firewood/src/merkle/node/extension.rs b/firewood/src/merkle/node/extension.rs index 8387f884d..fcbcc4e74 100644 --- a/firewood/src/merkle/node/extension.rs +++ b/firewood/src/merkle/node/extension.rs @@ -10,8 +10,6 @@ use crate::{ }; use std::fmt::{Debug, Error as FmtError, Formatter}; -pub const SIZE: usize = 2; - #[derive(PartialEq, Eq, Clone)] pub struct ExtNode { pub(crate) path: PartialPath, diff --git a/firewood/src/merkle/node/leaf.rs b/firewood/src/merkle/node/leaf.rs index 58b55d31e..475f62a00 100644 --- a/firewood/src/merkle/node/leaf.rs +++ b/firewood/src/merkle/node/leaf.rs @@ -8,8 +8,7 @@ use bincode::Options; use super::{Data, Encoded}; use crate::merkle::{from_nibbles, PartialPath}; -// will be needed when extension node is removed -// pub const SIZE: usize = 2; +pub const SIZE: usize = 2; #[derive(PartialEq, Eq, Clone)] pub struct LeafNode {