From e718fc31b6826c31527d8cdd49259aca01573168 Mon Sep 17 00:00:00 2001
From: marioiordanov <mio@shardlabs.io>
Date: Tue, 12 Nov 2024 14:12:13 +0200
Subject: [PATCH] Change account logging on startup (#645)

* logging change and remove trait

* add new method
---
 .../starknet-devnet-types/src/rpc/contract_address.rs | 11 ++++-------
 crates/starknet-devnet-types/src/serde_helpers.rs     |  3 +--
 crates/starknet-devnet-types/src/traits.rs            |  4 ----
 crates/starknet-devnet/src/main.rs                    |  3 +--
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/crates/starknet-devnet-types/src/rpc/contract_address.rs b/crates/starknet-devnet-types/src/rpc/contract_address.rs
index 30f1b3d24..ec9bbed9b 100644
--- a/crates/starknet-devnet-types/src/rpc/contract_address.rs
+++ b/crates/starknet-devnet-types/src/rpc/contract_address.rs
@@ -8,7 +8,6 @@ use crate::patricia_key::{PatriciaKey, PATRICIA_KEY_ZERO};
 use crate::serde_helpers::hex_string::{
     deserialize_to_prefixed_contract_address, serialize_contract_address_to_prefixed_hex,
 };
-use crate::traits::ToHexString;
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct ContractAddress(pub(crate) PatriciaKey);
@@ -22,6 +21,10 @@ impl ContractAddress {
     pub fn zero() -> Self {
         Self(PATRICIA_KEY_ZERO)
     }
+
+    pub fn to_fixed_hex_string(&self) -> String {
+        self.0.0.to_fixed_hex_string()
+    }
 }
 
 impl Serialize for ContractAddress {
@@ -63,12 +66,6 @@ impl From<ContractAddress> for Felt {
     }
 }
 
-impl ToHexString for ContractAddress {
-    fn to_prefixed_hex_str(&self) -> String {
-        self.0.0.to_hex_string()
-    }
-}
-
 impl LowerHex for ContractAddress {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(self.0.0.to_hex_string().as_str())
diff --git a/crates/starknet-devnet-types/src/serde_helpers.rs b/crates/starknet-devnet-types/src/serde_helpers.rs
index 89437deaf..0863b6340 100644
--- a/crates/starknet-devnet-types/src/serde_helpers.rs
+++ b/crates/starknet-devnet-types/src/serde_helpers.rs
@@ -64,7 +64,6 @@ pub mod hex_string {
     use crate::contract_address::ContractAddress;
     use crate::felt::felt_from_prefixed_hex;
     use crate::patricia_key::PatriciaKey;
-    use crate::traits::ToHexString;
 
     pub fn deserialize_to_prefixed_patricia_key<'de, D>(
         deserializer: D,
@@ -103,7 +102,7 @@ pub mod hex_string {
     where
         S: Serializer,
     {
-        s.serialize_str(contract_address.to_prefixed_hex_str().as_str())
+        serialize_patricia_key_to_prefixed_hex(&contract_address.0, s)
     }
 
     pub fn deserialize_prefixed_hex_string_to_felt<'de, D>(
diff --git a/crates/starknet-devnet-types/src/traits.rs b/crates/starknet-devnet-types/src/traits.rs
index d43b89c21..12a0152a7 100644
--- a/crates/starknet-devnet-types/src/traits.rs
+++ b/crates/starknet-devnet-types/src/traits.rs
@@ -1,9 +1,5 @@
 use starknet_types_core::felt::Felt;
 
-pub trait ToHexString {
-    fn to_prefixed_hex_str(&self) -> String;
-}
-
 pub trait HashProducer {
     type Error;
     fn generate_hash(&self) -> Result<Felt, Self::Error>;
diff --git a/crates/starknet-devnet/src/main.rs b/crates/starknet-devnet/src/main.rs
index cba0ea188..6c69d22d0 100644
--- a/crates/starknet-devnet/src/main.rs
+++ b/crates/starknet-devnet/src/main.rs
@@ -30,7 +30,6 @@ use starknet_rs_providers::{JsonRpcClient, Provider, ProviderError};
 use starknet_types::chain_id::ChainId;
 use starknet_types::rpc::state::Balance;
 use starknet_types::serde_helpers::rpc_sierra_contract_class_to_sierra_contract_class::deserialize_to_sierra_contract_class;
-use starknet_types::traits::ToHexString;
 use tokio::net::TcpListener;
 #[cfg(unix)]
 use tokio::signal::unix::{signal, SignalKind};
@@ -86,7 +85,7 @@ fn log_predeployed_accounts(
 | Account address |  {}
 | Private key     |  {}
 | Public key      |  {}",
-            account.account_address.to_prefixed_hex_str(),
+            account.account_address.to_fixed_hex_string(),
             account.private_key.to_fixed_hex_string(),
             account.public_key.to_fixed_hex_string()
         );