Minor cleanup

Author: BrianBland

src/node.rs

@@ -633,6 +633,7 @@ impl Encodable for Node {
     }
 }
 
+#[inline]
 pub fn encode_account_leaf(
     nonce_rlp: &ArrayVec<u8, 9>,
     balance_rlp: &ArrayVec<u8, 33>,
@@ -653,6 +654,7 @@ pub fn encode_account_leaf(
     len
 }
 
+#[inline]
 pub fn encode_branch(children: &[Option<Pointer>], out: &mut dyn BufMut) -> usize {
     // first encode the header
     let mut payload_length = 1;

src/transaction.rs

@@ -92,7 +92,7 @@ impl<DB: Deref<Target = Database>, K: TransactionKind> Transaction<DB, K> {
         self.database
             .storage_engine
             .compute_state_root_with_overlay_iterative(&self.context, overlay_state)
-            .map_err(|_| TransactionError::Generic)
+            .map_err(|_| TransactionError)
     }
 
     pub fn get_account_with_proof(

src/transaction/error.rs

@@ -1,21 +1,11 @@
 use std::{error::Error, fmt};
 
 #[derive(Debug)]
-pub enum TransactionError {
-    /// Generic transaction error (for backward compatibility)
-    Generic,
-    /// Overlay functionality is not enabled for this transaction
-    OverlayNotEnabled,
-}
+pub struct TransactionError;
 
 impl fmt::Display for TransactionError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Generic => write!(f, "transaction error"),
-            Self::OverlayNotEnabled => {
-                write!(f, "overlay functionality is not enabled for this transaction")
-            }
-        }
+        write!(f, "transaction error")
     }
 }
 

src/transaction/manager.rs

@@ -25,7 +25,7 @@ impl TransactionManager {
     pub fn begin_rw(&mut self, snapshot_id: SnapshotId) -> Result<SnapshotId, TransactionError> {
         // only allow one writable transaction at a time
         if self.has_writer {
-            return Err(TransactionError::Generic);
+            return Err(TransactionError);
         }
         self.has_writer = true;
         self.open_txs.push(snapshot_id - 1);