Merge pull request #54 from aurora-is-near/chore/aleksuss/err_msg_omp…

…timize chore: optimise converting error into message
Near-One · May 19, 2023 · 0344f6e · 0344f6e
2 parents b1308fd + e497cd5
commit 0344f6e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/eth-connector-tests/Cargo.toml b/eth-connector-tests/Cargo.toml
@@ -27,8 +27,8 @@ hex = "0.4.3"
 ethabi = "18.0"
 rlp = { version = "0.5.0", default-features = false }
 aurora-engine-migration-tool = { git = "https://github.com/aurora-is-near/aurora-engine-migration-tool.git" }
-aurora-workspace-eth-connector = { git = "https://github.com/aurora-is-near/aurora-workspace.git", rev = "9a7e87cc4e3b96ead6c28417482728f0141b1dea" }
-aurora-workspace-utils = { git = "https://github.com/aurora-is-near/aurora-workspace.git", rev = "9a7e87cc4e3b96ead6c28417482728f0141b1dea" }
+aurora-workspace-eth-connector = { git = "https://github.com/aurora-is-near/aurora-workspace.git", tag = "0.2.0" }
+aurora-workspace-utils = { git = "https://github.com/aurora-is-near/aurora-workspace.git", tag = "0.2.0" }
 
 [features]
 migration-tests = []
diff --git a/eth-connector/src/types.rs b/eth-connector/src/types.rs
@@ -1,5 +1,8 @@
+use aurora_engine_types::str::from_utf8;
 use near_sdk::env::panic_str;
 
+const INVALID_UTF8_ERR_STRING: &str = "INVALID_UTF8_ERR_STRING";
+
 #[macro_export]
 macro_rules! log {
     ($($args:tt)*) => {
@@ -10,7 +13,7 @@ macro_rules! log {
 
 /// Panic with the message from the error argument.
 pub fn panic_err<E: AsRef<[u8]>>(err: E) -> ! {
-    panic_str(&String::from_utf8_lossy(err.as_ref()))
+    panic_str(err_to_str(&err))
 }
 
 pub trait SdkExpect<T> {
@@ -41,6 +44,10 @@ impl<T> SdkUnwrap<T> for Option<T> {
 
 impl<T, E: AsRef<[u8]>> SdkUnwrap<T> for Result<T, E> {
     fn sdk_unwrap(self) -> T {
-        self.unwrap_or_else(|e| panic_str(&String::from_utf8_lossy(e.as_ref())))
+        self.unwrap_or_else(|e| panic_str(err_to_str(&e)))
     }
 }
+
+fn err_to_str<E: AsRef<[u8]>>(err: &E) -> &str {
+    from_utf8(err.as_ref()).unwrap_or(INVALID_UTF8_ERR_STRING)
+}