fix decoding and clippy warning

morph-dev · Mar 25, 2024 · a516fb0 · a516fb0
1 parent 90f5fc5
commit a516fb0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/merkle_old/proptest-regressions/mpt.txt b/merkle_old/proptest-regressions/mpt.txt
diff --git a/merkle_old/src/nodes/decode.rs b/merkle_old/src/nodes/decode.rs
@@ -9,9 +9,6 @@ pub(crate) enum RlpStructure {
 
 impl Decodable for RlpStructure {
     fn decode(buf: &mut &[u8]) -> alloy_rlp::Result<Self> {
-        if buf[0] < EMPTY_STRING_CODE {
-            return Ok(Self::Value(buf.copy_to_bytes(1)));
-        }
         let header = Header::decode(buf)?;
 
         if header.list {

diff --git a/merkle_old/src/nodes/node.rs b/merkle_old/src/nodes/node.rs
@@ -1,5 +1,5 @@
 use alloy_primitives::{keccak256, B256};
-use alloy_rlp::{Decodable, Encodable, EMPTY_STRING_CODE};
+use alloy_rlp::{Decodable, Encodable};
 use anyhow::{bail, Result};
 use bytes::Bytes;
 use db::Db;
@@ -46,12 +46,15 @@ impl Encodable for Node {
 
 impl Decodable for Node {
     fn decode(buf: &mut &[u8]) -> alloy_rlp::Result<Self> {
-        if buf[0] == EMPTY_STRING_CODE {
-            return Ok(Node::Nil);
-        }
-
-        let RlpStructure::List(payloads) = RlpStructure::decode(buf)? else {
-            return Err(alloy_rlp::Error::UnexpectedString);
+        let payloads = match RlpStructure::decode(buf)? {
+            RlpStructure::List(payloads) => payloads,
+            RlpStructure::Value(value) => {
+                return if value.is_empty() {
+                    Ok(Node::Nil)
+                } else {
+                    Err(alloy_rlp::Error::UnexpectedString)
+                };
+            }
         };
         match payloads.len() {
             2 => {