fix: remove uneeded to_hex_string code

Author: samparsky

adapter/src/dummy.rs

@@ -42,7 +42,7 @@ impl Adapter for DummyAdapter {
         let signature = format!(
             "Dummy adapter signature for {} by {}",
             state_root,
-            self.whoami().to_hex_prefix_string()
+            self.whoami().to_string()
         );
         Ok(signature)
     }
@@ -56,7 +56,7 @@ impl Adapter for DummyAdapter {
         // select the `identity` and compare it to the signer
         // for empty string this will return array with 1 element - an empty string `[""]`
         let is_same = match signature.rsplit(' ').take(1).next() {
-            Some(from) => from == signer.to_hex_prefix_string(),
+            Some(from) => from == signer.to_string(),
             None => false,
         };
 

adapter/src/ethereum.rs

@@ -411,7 +411,7 @@ mod test {
         let mut eth_adapter = setup_eth_adapter();
         let whoami = eth_adapter.whoami();
         assert_eq!(
-            whoami.to_hex_prefix_string(),
+            whoami.to_string(),
             "0x2bdeafae53940669daa6f519373f686c1f3d3393",
             "failed to get correct whoami"
         );

primitives/src/validator.rs

@@ -24,10 +24,6 @@ pub type ValidatorFuture<T> = Pin<Box<dyn Future<Output = Result<T, ValidatorErr
 pub struct ValidatorId(#[serde(with = "SerHex::<StrictPfx>")] [u8; 20]);
 
 impl ValidatorId {
-    pub fn to_hex_prefix_string(&self) -> String {
-        format!("0x{}", hex::encode(self.0))
-    }
-
     pub fn inner(&self) -> [u8; 20] {
         self.0
     }

validator_worker/src/core/fees.rs

@@ -209,9 +209,9 @@ mod test {
             let expected_balances: BalancesMap = vec![
                 ("a".to_string(), 990.into()),
                 ("b".to_string(), 1_188.into()),
-                (IDS.get("leader").unwrap().to_hex_prefix_string(), 11.into()),
+                (IDS.get("leader").unwrap().to_string(), 11.into()),
                 (
-                    IDS.get("follower").unwrap().to_hex_prefix_string(),
+                    IDS.get("follower").unwrap().to_string(),
                     11.into(),
                 ),
             ]
@@ -237,7 +237,7 @@ mod test {
                 ("a".to_string(), 100.into()),
                 ("b".to_string(), 2_000.into()),
                 (
-                    IDS.get("leader").unwrap().to_hex_prefix_string(),
+                    IDS.get("leader").unwrap().to_string(),
                     200.into(),
                 ),
             ]
@@ -248,11 +248,11 @@ mod test {
                 ("a".to_string(), 99.into()),
                 ("b".to_string(), 1_980.into()),
                 (
-                    IDS.get("leader").unwrap().to_hex_prefix_string(),
+                    IDS.get("leader").unwrap().to_string(),
                     209.into(),
                 ),
                 (
-                    IDS.get("follower").unwrap().to_hex_prefix_string(),
+                    IDS.get("follower").unwrap().to_string(),
                     11.into(),
                 ),
             ]
@@ -291,9 +291,9 @@ mod test {
                 ("c".to_string(), 693.into()),
                 ("d".to_string(), 4_950.into()),
                 ("e".to_string(), 3_960.into()),
-                (IDS.get("leader").unwrap().to_hex_prefix_string(), 51.into()),
+                (IDS.get("leader").unwrap().to_string(), 51.into()),
                 (
-                    IDS.get("follower").unwrap().to_hex_prefix_string(),
+                    IDS.get("follower").unwrap().to_string(),
                     50.into(),
                 ),
             ]

validator_worker/src/follower.rs

@@ -24,7 +24,7 @@ enum NewStateResult {
 pub async fn tick<A: Adapter + 'static>(iface: &SentryApi<A>) -> Result<(), Box<dyn Error>> {
     let from = iface.channel.spec.validators.leader().id.clone();
     let new_msg_response = iface
-        .get_latest_msg(from.to_hex_prefix_string(), &["NewState"])
+        .get_latest_msg(from.to_string(), &["NewState"])
         .await?;
     let new_msg = match new_msg_response {
         Some(MessageTypes::NewState(new_state)) => Some(new_state),

validator_worker/src/lib.rs

@@ -83,8 +83,8 @@ mod test {
         let iface = setup_iface(&channel);
 
         let balances: BalancesMap = vec![
-            (IDS["publisher"].to_hex_prefix_string(), 1.into()),
-            (IDS["tester"].to_hex_prefix_string(), 2.into()),
+            (IDS["publisher"].to_string(), 1.into()),
+            (IDS["tester"].to_string(), 2.into()),
         ]
         .into_iter()
         .collect();

validator_worker/src/main.rs

@@ -158,7 +158,7 @@ async fn infinite<A: Adapter + 'static>(args: Args<A>) -> Result<(), ()> {
 }
 
 async fn iterate_channels<A: Adapter + 'static>(args: Args<A>) -> Result<(), ()> {
-    let result = all_channels(&args.sentry_url, args.whoami.to_hex_prefix_string()).await;
+    let result = all_channels(&args.sentry_url, args.whoami.to_string()).await;
 
     if let Err(e) = result {
         eprintln!("Failed to get channels {}", e);

validator_worker/src/sentry_interface.rs

@@ -120,7 +120,7 @@ impl<T: Adapter + 'static> SentryApi<T> {
         &self,
         message_types: &[&str],
     ) -> Result<Option<MessageTypes>, reqwest::Error> {
-        self.get_latest_msg(self.whoami.to_hex_prefix_string(), message_types)
+        self.get_latest_msg(self.whoami.to_string(), message_types)
             .await
     }