From 13c92898443c8b6954e887995f4971da877c3d2e Mon Sep 17 00:00:00 2001
From: Avishai Weingarten <avishai@enigma.co>
Date: Mon, 6 May 2019 11:54:51 +0300
Subject: [PATCH] BUG: change error print from debug to display which will show
 only the error without the backtrace. fixxes
 https://github.com/enigmampc/discovery-integration-tests/issues/10

---
 enigma-core/app/src/networking/messages.rs              | 6 +++---
 enigma-core/app/tests/ipc_identity_and_general_tests.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/enigma-core/app/src/networking/messages.rs b/enigma-core/app/src/networking/messages.rs
index 5a5e15a9..bf982dd0 100644
--- a/enigma-core/app/src/networking/messages.rs
+++ b/enigma-core/app/src/networking/messages.rs
@@ -226,13 +226,13 @@ pub(crate) trait UnwrapError<T> {
     fn unwrap_or_error(self) -> T;
 }
 
-impl<E: std::fmt::Debug> UnwrapError<IpcResponse> for Result<IpcResponse, E> {
+impl<E: std::fmt::Display> UnwrapError<IpcResponse> for Result<IpcResponse, E> {
     fn unwrap_or_error(self) -> IpcResponse {
         match self {
             Ok(m) => m,
             Err(e) => {
-                error!("Unwrapped p2p Message failed: {:?}", e);
-                IpcResponse::Error {msg: format!("{:?}", e)}
+                error!("Unwrapped p2p Message failed: {}", e);
+                IpcResponse::Error {msg: format!("{}", e)}
             }
         }
     }
diff --git a/enigma-core/app/tests/ipc_identity_and_general_tests.rs b/enigma-core/app/tests/ipc_identity_and_general_tests.rs
index f3a4639e..69b36203 100644
--- a/enigma-core/app/tests/ipc_identity_and_general_tests.rs
+++ b/enigma-core/app/tests/ipc_identity_and_general_tests.rs
@@ -40,7 +40,7 @@ fn test_deploy_with_no_ptt() {
     run_core(port);
     let _val = erc20_deployment_without_ptt_to_addr(port, &generate_contract_address().to_hex());
     let accepted_err =  _val["msg"].as_str().unwrap();
-    assert_eq!(accepted_err, "EnclaveFailError { err: KeysError, status: SGX_SUCCESS }");
+    assert_eq!(accepted_err, "Error inside the Enclave = (KeysError)");
 }
 
 #[test]
@@ -53,7 +53,7 @@ fn test_compute_on_empty_address() {
     let callable  = "mint(bytes32,uint256)";
     let (_val,_) = contract_compute(port, _address.into(), &args, callable);
     let accepted_err =  _val["msg"].as_str().unwrap();
-    assert_eq!(accepted_err, "DBErr { command: \"read\", kind: MissingKey }");
+    assert_eq!(accepted_err, "Error while trying to read, Because: The Key doesn\'t exist");
 }
 
 #[test]
@@ -96,7 +96,7 @@ fn test_deploy_same_contract_twice() {
     let _deploy_first = erc20_deployment_without_ptt_to_addr(port, &address.to_hex());
     let _deploy_second = erc20_deployment_without_ptt_to_addr(port, &address.to_hex());
     let accepted_err =  _deploy_second["msg"].as_str().unwrap();
-    assert_eq!(accepted_err, "DBErr { command: \"create\", kind: KeyExists }");
+    assert_eq!(accepted_err, "Error while trying to create, Because: The Key already exists");
 }
 
 #[test]