Optimize string decoding, simplify function

CosmWasm · May 8, 2024 · 98861f1 · 98861f1
1 parent 383092d
commit 98861f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/packages/std/src/imports.rs b/packages/std/src/imports.rs
@@ -371,9 +371,7 @@ impl Api for ExternalApi {
             )));
         }
 
-        // TODO: Optimize this heap allocation away?
-        // I mean technically we save a bunch of heap allocation now anyway, but we can optimize this, too!
-        let address = unsafe { consume_string_region_written_by_vm(human.to_heap_ptr()) };
+        let address = unsafe { String::from_utf8_unchecked(human.into_vec()) };
         Ok(Addr::unchecked(address))
     }
 

diff --git a/packages/std/src/memory.rs b/packages/std/src/memory.rs
@@ -162,10 +162,5 @@ where
 /// or zero if not present
 #[cfg(feature = "iterator")]
 pub fn get_optional_region_address<O: Ownership>(region: &Option<&Region<O>>) -> u32 {
-    /// Returns the address of the Region as an offset in linear memory
-    fn get_region_address<O: Ownership>(region: &Region<O>) -> u32 {
-        region.as_ptr() as u32
-    }
-
-    region.map(get_region_address).unwrap_or(0)
+    region.map(|r| r.as_ptr() as u32).unwrap_or(0)
 }