From 5607ab4a4de3b3a911bf0a6ed6db1ee551712660 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Thu, 12 Oct 2023 12:24:06 +0200
Subject: [PATCH 1/2] chore: make memory-limit private

---
 .../src/interpreter/shared_memory.rs          | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/crates/interpreter/src/interpreter/shared_memory.rs b/crates/interpreter/src/interpreter/shared_memory.rs
index 389194e797..a3d163b523 100644
--- a/crates/interpreter/src/interpreter/shared_memory.rs
+++ b/crates/interpreter/src/interpreter/shared_memory.rs
@@ -22,24 +22,7 @@ pub struct SharedMemory {
     current_len: usize,
     /// Memory limit. See [`crate::CfgEnv`].
     #[cfg(feature = "memory_limit")]
-    pub memory_limit: u64,
-}
-
-impl fmt::Debug for SharedMemory {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("SharedMemory")
-            .field(
-                "current_slice",
-                &crate::primitives::hex::encode(self.context_memory()),
-            )
-            .finish()
-    }
-}
-
-impl Default for SharedMemory {
-    fn default() -> Self {
-        Self::new()
-    }
+    memory_limit: u64,
 }
 
 impl SharedMemory {
@@ -250,6 +233,24 @@ impl SharedMemory {
     }
 }
 
+impl fmt::Debug for SharedMemory {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SharedMemory")
+            .field("current_len", &self.current_len)
+            .field(
+                "current_slice",
+                &crate::primitives::hex::encode(self.context_memory()),
+            )
+            .finish_non_exhaustive()
+    }
+}
+
+impl Default for SharedMemory {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 /// Rounds up `x` to the closest multiple of 32. If `x % 32 == 0` then `x` is returned.
 #[inline]
 pub fn next_multiple_of_32(x: usize) -> Option<usize> {

From 324cade2daeef663ab3ed791f8cd8cf2ae735c92 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Thu, 12 Oct 2023 12:37:58 +0200
Subject: [PATCH 2/2] Update
 crates/interpreter/src/interpreter/shared_memory.rs

Co-authored-by: Lorenzo Feroleto <60553286+lorenzofero@users.noreply.github.com>
---
 crates/interpreter/src/interpreter/shared_memory.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/interpreter/src/interpreter/shared_memory.rs b/crates/interpreter/src/interpreter/shared_memory.rs
index a3d163b523..94ba4221e7 100644
--- a/crates/interpreter/src/interpreter/shared_memory.rs
+++ b/crates/interpreter/src/interpreter/shared_memory.rs
@@ -238,7 +238,7 @@ impl fmt::Debug for SharedMemory {
         f.debug_struct("SharedMemory")
             .field("current_len", &self.current_len)
             .field(
-                "current_slice",
+                "context_memory",
                 &crate::primitives::hex::encode(self.context_memory()),
             )
             .finish_non_exhaustive()