From 3d7992835fe12524c5d987af3a6c86990c85e2ae Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Sun, 12 Jul 2020 19:13:45 +0100
Subject: [PATCH] rename to runProtocol, remove ProtocolCmd constructor export

---
 definitions/src/Control/Protocol.hs            | 18 +++++++-----------
 .../src/Simplex/Messaging/PrintScenario.hs     |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/definitions/src/Control/Protocol.hs b/definitions/src/Control/Protocol.hs
index 7549bba62..d93db6861 100644
--- a/definitions/src/Control/Protocol.hs
+++ b/definitions/src/Control/Protocol.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -11,10 +10,10 @@
 
 module Control.Protocol
   ( Protocol,
-    ProtocolCmd (..),
+    ProtocolCmd,
     Command,
     (->:),
-    interpret,
+    runProtocol,
   )
 where
 
@@ -43,22 +42,19 @@ infix 6 ->:
   Protocol cmd ps s (Inj ps (Inj ps s from fs') to ts') a
 (->:) f t c = xfree $ ProtocolCmd f t c
 
-interpret ::
+runProtocol ::
   forall m cmd ps s s' a.
   Monad m =>
   (forall from to b. (Sing (P from) -> Sing (P to) -> cmd from to b -> m b)) ->
   Protocol cmd ps s s' a ->
   m a
-interpret runCommand = loop
+runProtocol runCmd = loop
   where
     loop :: forall s1 s2 b. Protocol cmd ps s1 s2 b -> m b
-    loop = \case
-      Pure x -> return x
-      Bind c f -> do
-        x <- run c
-        loop (f x)
+    loop (Pure x) = return x
+    loop (Bind c f) = run c >>= loop . f
     run :: forall s1 s2 b. ProtocolCmd cmd ps s1 s2 b -> m b
-    run (ProtocolCmd from to cmd) = runCommand from to cmd
+    run (ProtocolCmd from to cmd) = runCmd from to cmd
 
 type family P (partyCmd :: (party, s, s)) where
   P '(p, _, _) = p
diff --git a/definitions/src/Simplex/Messaging/PrintScenario.hs b/definitions/src/Simplex/Messaging/PrintScenario.hs
index a4bfb1090..30d202778 100644
--- a/definitions/src/Simplex/Messaging/PrintScenario.hs
+++ b/definitions/src/Simplex/Messaging/PrintScenario.hs
@@ -10,7 +10,7 @@
 module Simplex.Messaging.PrintScenario where
 
 import Control.Monad.Writer
-import Control.Protocol (interpret)
+import Control.Protocol (runProtocol)
 import Data.Singletons
 import Simplex.Messaging.Protocol
 import Simplex.Messaging.Types
@@ -28,7 +28,7 @@ printScenario scn = ps 1 "" $ execWriter $ logScenario scn
         prefix s = "   - " <> s
 
 logScenario :: MonadWriter [(String, String)] m => SimplexProtocol s s' a -> m a
-logScenario = interpret $ \from to cmd -> do
+logScenario = runProtocol $ \from to cmd -> do
   tell [(party from, commandStr cmd <> " " <> party to)]
   mockCommand cmd