Skip to content

Commit

Permalink
Add derive Debug
Browse files Browse the repository at this point in the history
  • Loading branch information
morph-dev committed Jan 22, 2024
1 parent 8a5d334 commit a0f9d23
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion merkle/src/account.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
use alloy_primitives::{keccak256, B256, U256};
use alloy_rlp::{RlpDecodable, RlpEncodable};
use serde::{Serialize, Deserialize};

use crate::nodes::node::NodeRef;

#[derive(Clone, RlpEncodable, RlpDecodable)]
#[derive(Clone, RlpEncodable, RlpDecodable, Serialize, Deserialize)]
pub struct AccountState {
pub nonce: u64,
pub balance: U256,
Expand Down
4 changes: 2 additions & 2 deletions merkle/src/mpt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use crate::{
};

pub struct MerklePatriciaTrie {
root: NodeRef,
db: Box<dyn Db<B256, Vec<u8>>>,
pub root: NodeRef,
pub db: Box<dyn Db<B256, Vec<u8>>>,
}

impl Default for MerklePatriciaTrie {
Expand Down
2 changes: 1 addition & 1 deletion merkle/src/nibbles.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use derive_more::{Deref, Index};

#[derive(Clone, Deref, Index)]
#[derive(Clone, Deref, Index, Debug)]
pub struct Nibbles {
nibbles: Vec<u8>,
}
Expand Down
2 changes: 1 addition & 1 deletion merkle/src/nodes/branch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::nibbles::Nibbles;

use super::node::{Node, NodeRef};

#[derive(Default, Clone)]
#[derive(Default, Clone, Debug)]
pub struct BranchNode {
pub nodes: [NodeRef; 16],
pub value: Option<Vec<u8>>,
Expand Down
2 changes: 1 addition & 1 deletion merkle/src/nodes/extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::{nibbles::Nibbles, nodes::branch::BranchNode};

use super::node::{Node, NodeRef};

#[derive(Clone)]
#[derive(Clone, Debug)]
pub struct ExtensionNode {
pub path: Nibbles,
pub node: NodeRef,
Expand Down
2 changes: 1 addition & 1 deletion merkle/src/nodes/leaf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::{

use super::node::Node;

#[derive(Clone)]
#[derive(Clone, Debug)]
pub struct LeafNode {
pub path: Nibbles,
pub value: Vec<u8>,
Expand Down
3 changes: 2 additions & 1 deletion merkle/src/nodes/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::{nibbles::Nibbles, nodes::decode::RlpStructure};

use super::{branch::BranchNode, extension::ExtensionNode, leaf::LeafNode};

#[derive(Clone, Default)]
#[derive(Clone, Default, Debug)]
pub enum Node {
#[default]
Nil,
Expand Down Expand Up @@ -91,6 +91,7 @@ impl Decodable for Node {
}
}

#[derive(Debug)]
pub struct NodeRef {
pub hash: B256,
pub node: Option<Box<Node>>,
Expand Down

0 comments on commit a0f9d23

Please sign in to comment.