Generalize Node Encoding Scheme #269
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
richardpringle
force-pushed
the
rlwhat
branch
from
5fb92f0
to
03ebe80
Compare
richardpringle
force-pushed
the
rlwhat
branch
from
83879fa
to
c0312a3
Compare
richardpringle
commented
Sep 25, 2023
| } else { | ||
| Ok(NodeType::Extension(ExtNode::new( | ||
| cur_key, | ||
| DiskAddress::null(), |
There was a problem hiding this comment.
@xinifinity, why is this DiskAddress::null()?
richardpringle
commented
Sep 25, 2023
firewood/src/merkle/node.rs
Outdated
| pub enum Error { | ||
| #[error("decoding error")] | ||
| Decode(#[from] bincode::Error), | ||
| } |
There was a problem hiding this comment.
I think I can remove this wrapped error and just use bincode::Error
richardpringle
commented
Sep 25, 2023
firewood/src/merkle/node.rs
Outdated
| fn calc_eth_rlp<S: ShaleStore<Node>>(&self, store: &S) -> Vec<u8> { | ||
| let mut stream = rlp::RlpStream::new_list(17); | ||
| // let mut stream = rlp::RlpStream::new_list(NBRANCH + 1); |
There was a problem hiding this comment.
Still have to delete the old, commented code
richardpringle
commented
Sep 25, 2023
| // Ok(EXT_NODE_SIZE) => { | ||
| // [Encoded<Vec<u8>>; 2] | ||
| // 0 is always Encoded::Data | ||
| // 1 could be either |
There was a problem hiding this comment.
I should remove these comments, they aren't relevant here
richardpringle
force-pushed
the
rlwhat
branch
from
fe8c118
to
4fab38e
Compare
rkuris
approved these changes
Sep 25, 2023
firewood/src/merkle/node.rs
Outdated
| @@ -78,44 +79,67 @@ impl BranchNode { | |||
| } | |||
|
|
|||
| fn calc_eth_rlp<S: ShaleStore<Node>>(&self, store: &S) -> Vec<u8> { | |||
| let mut stream = rlp::RlpStream::new_list(17); | |||
| // let mut stream = rlp::RlpStream::new_list(NBRANCH + 1); | |||
firewood/src/merkle/node.rs
Outdated
| fn calc_eth_rlp<S: ShaleStore<Node>>(&self, store: &S) -> Vec<u8> { | ||
| let mut stream = rlp::RlpStream::new_list(17); | ||
| // let mut stream = rlp::RlpStream::new_list(NBRANCH + 1); |
firewood/src/proof.rs
Outdated
|
|
||
| // consume items returning the item at index | ||
|
|
||
| let data: Vec<u8> = items.into_element_at(index).decode()?; |
There was a problem hiding this comment.
nit: Not a fan of a trait only used in one place, just inline it or use a macro.
firewood/src/proof.rs
Outdated
| // Ok(_) => Err(ProofError::DecodeError(rlp::DecoderError::RlpInvalidLength)), | ||
| // Err(e) => Err(ProofError::DecodeError(e)), | ||
| _ => Err(ProofError::DecodeError(Box::new( | ||
| bincode::ErrorKind::Custom(String::from("")), |
There was a problem hiding this comment.
bad => Err(ProofError::DecodeError(Box::new(
bincode::ErrorKind::Custom(format!("{} invalid", bad)),
firewood/src/proof.rs
Outdated
| @@ -225,7 +249,10 @@ impl<N: AsRef<[u8]> + Send> Proof<N> { | |||
| hash: Some(sub_hash), | |||
| }) | |||
| } | |||
| _ => Err(ProofError::DecodeError(rlp::DecoderError::RlpInvalidLength)), | |||
| // _ => Err(ProofError::DecodeError(rlp::DecoderError::RlpInvalidLength)), | |||
| _ => Err(ProofError::DecodeError(Box::new( | |||
There was a problem hiding this comment.
same comment as above; knowing the value might make debugging a little easier
firewood/src/proof.rs
Outdated
| @@ -1077,3 +1132,17 @@ fn unset_node_ref<K: AsRef<[u8]>, S: ShaleStore<Node> + Send + Sync>( | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| trait IntoElementAt { | |||
There was a problem hiding this comment.
nit: remove this trait; see earlier comment
xinifinity
approved these changes
Sep 25, 2023
| @@ -1381,4 +1383,87 @@ mod test { | |||
| check(node); | |||
| } | |||
| } | |||
| #[test] | |||
| fn test_encode() { | |||
There was a problem hiding this comment.
nit: test_encode_decode?
There was a problem hiding this comment.
This is your commit! You can PR the change after this lands
richardpringle
force-pushed
the
rlwhat
branch
from
359554f
to
810623b
Compare
xinifinity
approved these changes
Sep 25, 2023
richardpringle
force-pushed
the
rlwhat
branch
from
810623b
to
c49c09b
Compare
richardpringle
force-pushed
the
rlwhat
branch
from
c49c09b
to
7eef09e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use bincode to encode Nodes and add encoding/decoding test.