From 0f6df63bfaa982598c06561f9ee1acca485dc147 Mon Sep 17 00:00:00 2001
From: AvivYossef-starkware <aviv.y@starkware.co>
Date: Wed, 10 Jul 2024 14:46:40 +0300
Subject: [PATCH] fix: declare transaction error format

commit-id:5ae2b059
---
 .../src/transaction/error_format_test.rs         | 16 +++++++++++++++-
 crates/blockifier/src/transaction/errors.rs      |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/crates/blockifier/src/transaction/error_format_test.rs b/crates/blockifier/src/transaction/error_format_test.rs
index 6b9faae920..158f90b57d 100644
--- a/crates/blockifier/src/transaction/error_format_test.rs
+++ b/crates/blockifier/src/transaction/error_format_test.rs
@@ -1,10 +1,12 @@
 use rstest::rstest;
+use starknet_api::core::ClassHash;
+use starknet_api::hash::StarkHash;
 use starknet_api::transaction::TransactionVersion;
 
 use crate::transaction::errors::TransactionExecutionError;
 
 #[rstest]
-fn test_contract_class_version_mismatch() {
+fn test_contract_class_version_mismatch_format() {
     let error = TransactionExecutionError::ContractClassVersionMismatch {
         declare_version: TransactionVersion::ONE,
         cairo_version: 2,
@@ -14,3 +16,15 @@ fn test_contract_class_version_mismatch() {
         "Declare transaction version 1 must have a contract class of Cairo version 2."
     );
 }
+
+#[rstest]
+fn test_declare_transaction_error_format() {
+    let error = TransactionExecutionError::DeclareTransactionError {
+        class_hash: ClassHash(StarkHash::THREE),
+    };
+    assert_eq!(
+        error.to_string(),
+        "Class with hash 0x0000000000000000000000000000000000000000000000000000000000000003 is \
+         already declared."
+    );
+}
diff --git a/crates/blockifier/src/transaction/errors.rs b/crates/blockifier/src/transaction/errors.rs
index 051ae6c74f..30e050456e 100644
--- a/crates/blockifier/src/transaction/errors.rs
+++ b/crates/blockifier/src/transaction/errors.rs
@@ -59,7 +59,7 @@ pub enum TransactionExecutionError {
         String::from(gen_transaction_execution_error_trace(self))
     )]
     ContractConstructorExecutionFailed(#[from] ConstructorEntryPointExecutionError),
-    #[error("Class with hash {class_hash:?} is already declared.")]
+    #[error("Class with hash {:#064x} is already declared.", **class_hash)]
     DeclareTransactionError { class_hash: ClassHash },
     #[error(
         "Transaction execution has failed:\n{}",