From 1e2c0cd606ec67d633478554d815c64c4018ffbc Mon Sep 17 00:00:00 2001
From: Marc Brinkmann <marc@casperlabs.io>
Date: Mon, 1 Jun 2020 12:56:24 +0200
Subject: [PATCH 1/3] Change `Responder` debug format to include type names

---
 src/effect.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/effect.rs b/src/effect.rs
index ffd5d5f895..08e3e55af0 100644
--- a/src/effect.rs
+++ b/src/effect.rs
@@ -36,6 +36,7 @@
 //! effects to turn them into events should also be kept brief.
 
 use std::{
+    any::type_name,
     fmt::{self, Debug, Display, Formatter},
     future::Future,
     time::{Duration, Instant},
@@ -82,7 +83,12 @@ impl<T, Ev> Responder<T, Ev> {
 
 impl<T, Ev> Debug for Responder<T, Ev> {
     fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
-        write!(formatter, "responder")
+        write!(
+            formatter,
+            "Responder<{}->{}>",
+            type_name::<T>(),
+            type_name::<Effect<Ev>>()
+        )
     }
 }
 

From 3cc08279aad85cc0cb3413c341cd01c9b48a1635 Mon Sep 17 00:00:00 2001
From: Marc Brinkmann <marc@casperlabs.io>
Date: Mon, 1 Jun 2020 12:57:13 +0200
Subject: [PATCH 2/3] Change `Responder` display format to be easier to read
 and not include length effect type

---
 src/effect.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/effect.rs b/src/effect.rs
index 08e3e55af0..ad10f71f18 100644
--- a/src/effect.rs
+++ b/src/effect.rs
@@ -94,7 +94,7 @@ impl<T, Ev> Debug for Responder<T, Ev> {
 
 impl<T, Ev> Display for Responder<T, Ev> {
     fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
-        Debug::fmt(self, formatter)
+        write!(formatter, "responder({})", type_name::<T>(),)
     }
 }
 

From 3cd9f1c1cb2ecc491569d0117344ae2a82db2e10 Mon Sep 17 00:00:00 2001
From: Marc Brinkmann <marc@casperlabs.io>
Date: Mon, 1 Jun 2020 12:58:06 +0200
Subject: [PATCH 3/3] Derive `Debug` automatically for storage events

---
 src/components/storage.rs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/components/storage.rs b/src/components/storage.rs
index 1a65ccb1bd..9044549b05 100644
--- a/src/components/storage.rs
+++ b/src/components/storage.rs
@@ -23,6 +23,7 @@ use linear_block_store::InMemBlockStore;
 
 pub(crate) type Storage = InMemStorage<Block>;
 
+#[derive(Debug)]
 pub(crate) enum Event<S: StorageType>
 where
     <S::BlockStore as BlockStoreType>::Block: Debug,
@@ -37,21 +38,6 @@ where
     },
 }
 
-impl<S: StorageType> Debug for Event<S> {
-    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
-        match self {
-            Event::PutBlock { block, .. } => {
-                write!(formatter, "Event::PutBlock {{ block: {:?} }}", block)
-            }
-            Event::GetBlock { block_hash, .. } => write!(
-                formatter,
-                "Event::GetBlock {{ block_hash: {:?} }}",
-                block_hash
-            ),
-        }
-    }
-}
-
 impl<S: StorageType> Display for Event<S> {
     fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         match self {