Farcaster: Improve logging of invalidating state transitions

farcaster-project · Oct 5, 2022 · 11f71f5 · 11f71f5
1 parent aecdf40
commit 11f71f5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 34 deletions.
diff --git a/src/farcasterd/syncer_state_machine.rs b/src/farcasterd/syncer_state_machine.rs
@@ -176,7 +176,13 @@ fn attempt_transition_to_awaiting_syncer_or_awaiting_syncer_request(
             }
         }
 
-        _ => Ok(None),
+        req => {
+            warn!(
+                "Request {} from {} invalid for state start - invalidating.",
+                req, event.source
+            );
+            Ok(None)
+        }
     }
 }
 

diff --git a/src/farcasterd/trade_state_machine.rs b/src/farcasterd/trade_state_machine.rs
@@ -379,17 +379,10 @@ fn attempt_transition_to_make_offer(
             }
         }
         req => {
-            if let Request::Hello = req {
-                trace!(
-                    "Request {} invalid for state start maker - invalidating.",
-                    req
-                );
-            } else {
-                warn!(
-                    "Request {} invalid for state start maker - invalidating.",
-                    req
-                );
-            }
+            warn!(
+                "Request {} from {} invalid for state start maker - invalidating.",
+                req, event.source
+            );
             Ok(None)
         }
     }
@@ -505,17 +498,10 @@ fn attempt_transition_to_take_offer(
             }
         }
         req => {
-            if let Request::Hello = req {
-                trace!(
-                    "Request {} invalid for state start restore - invalidating.",
-                    req
-                );
-            } else {
-                warn!(
-                    "Request {} invalid for state start restore - invalidating.",
-                    req
-                );
-            }
+            warn!(
+                "Request {} from {} invalid for state start restore - invalidating.",
+                req, event.source,
+            );
             Ok(None)
         }
     }
@@ -605,17 +591,10 @@ fn attempt_transition_to_restoring_swapd(
             })))
         }
         req => {
-            if let Request::Hello = req {
-                trace!(
-                    "Request {} invalid for state start restore - invalidating.",
-                    req
-                );
-            } else {
-                warn!(
-                    "Request {} invalid for state start restore - invalidating.",
-                    req
-                );
-            }
+            warn!(
+                "Request {} from {} invalid for state start restore - invalidating.",
+                req, event.source,
+            );
             Ok(None)
         }
     }