From f0358277314244259749ceba4b35df733223352a Mon Sep 17 00:00:00 2001
From: Dmitry Zuikov <dzuikov@gmail.com>
Date: Wed, 5 Apr 2023 05:03:22 +0300
Subject: [PATCH] fixed 6kx1sdj7ej

---
 .fixme/log                             | 11 ++---------
 hbs2-core/lib/HBS2/Net/Proto/RefLog.hs |  6 ++----
 hbs2-peer/app/PeerMain.hs              |  7 ++++---
 hbs2-peer/app/RefLog.hs                | 12 +-----------
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/.fixme/log b/.fixme/log
index a9671ba4..8e990696 100644
--- a/.fixme/log
+++ b/.fixme/log
@@ -1,10 +1,3 @@
 
-(fixme-set "workflow" "test" "5dkZ3UqkiT")
-(fixme-set "assigned" "voidlizard" "5dkZ3UqkiT")
-(fixme-set "workflow" "test" "3Xv2bBY3ac")
-(fixme-set "assigned" "fastpok" "3Xv2bBY3ac")
-(fixme-set "workflow" "test" "9MT1XdzCy8")
-(fixme-set "assigned" "voidlizard" "9MT1XdzCy8")
-(fixme-set "workflow" "test" "6mTMkyQUYR")
-(fixme-set "assigned" "voidlizard" "6mTMkyQUYR")
-(fixme-set "workflow" "backlog" "GYiBo1ubTf")
\ No newline at end of file
+(fixme-set "workflow" "test" "6kx1sdj7ej")
+(fixme-set "assigned" "voidlizard" "6kx1sdj7ej")
\ No newline at end of file
diff --git a/hbs2-core/lib/HBS2/Net/Proto/RefLog.hs b/hbs2-core/lib/HBS2/Net/Proto/RefLog.hs
index d517f222..beec0a0e 100644
--- a/hbs2-core/lib/HBS2/Net/Proto/RefLog.hs
+++ b/hbs2-core/lib/HBS2/Net/Proto/RefLog.hs
@@ -37,10 +37,9 @@ data RefLogUpdate e =
 
 makeLenses 'RefLogUpdate
 
-data RefLogUpdateI e m =
+newtype RefLogUpdateI e m =
   RefLogUpdateI
-  { refLogUpdate     :: (PubKey 'Sign e, RefLogUpdate e) -> m ()
-  , refLogBroadcast  :: RefLogUpdate e -> m ()
+  { refLogBroadcast  :: RefLogUpdate e -> m ()
   }
 
 data RefLogUpdateEv e
@@ -188,7 +187,6 @@ refLogUpdateProto adapter =
           -- FIXME: refactor:use-type-application-for-deferred
           deferred proto do
             emit @e RefLogUpdateEvKey (RefLogUpdateEvData (pubk, e))
-            refLogUpdate adapter (pubk, e)
             refLogBroadcast adapter e
             pure ()
 
diff --git a/hbs2-peer/app/PeerMain.hs b/hbs2-peer/app/PeerMain.hs
index 632c31e2..27db7c7c 100644
--- a/hbs2-peer/app/PeerMain.hs
+++ b/hbs2-peer/app/PeerMain.hs
@@ -561,7 +561,7 @@ runPeer opts = Exception.handle myException $ do
               let addNewRtt (p,rttNew) = withPeerM penv $ void $ runMaybeT do
                     def <- newPeerInfo
                     tv <- lift $ fetch True def (PeerInfoKey p) (view peerRTTBuffer)
-                    insertRTT rttNew tv 
+                    insertRTT rttNew tv
               let hshakeAdapter = PeerHandshakeAdapter addNewRtt
 
               env <- ask
@@ -638,7 +638,7 @@ runPeer opts = Exception.handle myException $ do
                         debug "Same peer, different address"
 
                         void $ runMaybeT do
-                          
+
                           pinfo0 <- MaybeT $ find (PeerInfoKey p0) id
                           pinfo1 <- MaybeT $ find (PeerInfoKey p) id
 
@@ -778,7 +778,8 @@ runPeer opts = Exception.handle myException $ do
                                 warn "unable to parse RefLogUpdate message"
 
                               maybe1 msg' none $ \msg -> do
-                                RefLog.doRefLogUpdate (view refLogId msg, msg)
+                                let pubk = view refLogId msg
+                                emit @e RefLogUpdateEvKey (RefLogUpdateEvData (pubk, msg))
                                 RefLog.doRefLogBroadCast msg
 
                             _ -> pure ()
diff --git a/hbs2-peer/app/RefLog.hs b/hbs2-peer/app/RefLog.hs
index 40487a9e..9bf76e9b 100644
--- a/hbs2-peer/app/RefLog.hs
+++ b/hbs2-peer/app/RefLog.hs
@@ -41,15 +41,6 @@ import Control.Concurrent.Async
 import Control.Monad.Trans.Maybe
 import Lens.Micro.Platform
 
-doRefLogUpdate :: forall e m . ( MonadIO m
-                               , Pretty (AsBase58 (PubKey 'Sign e))
-                               )
-               => (PubKey 'Sign e, RefLogUpdate e) -> m ()
-
-doRefLogUpdate (reflog, _) = do
-  trace $ "doRefLogUpdate" <+> pretty (AsBase58 reflog)
-  pure ()
-
 doRefLogBroadCast :: forall e m . ( MonadIO m
                                   , MyPeer e
                                   , HasPeerLocator e m
@@ -100,8 +91,7 @@ mkAdapter :: forall e m . ( MonadIO m
 
 mkAdapter = do
   let bcast = lift . doRefLogBroadCast @e
-  let upd   = lift . doRefLogUpdate @e
-  pure $ RefLogUpdateI upd bcast
+  pure $ RefLogUpdateI bcast
 
 
 data RefLogWorkerAdapter e =