From e53c6e84fca4437db719e6ab557c92386ab220f4 Mon Sep 17 00:00:00 2001
From: Sergey Ivanov <ivanovs-4@yandex.ru>
Date: Wed, 12 Jul 2023 23:27:51 +0400
Subject: [PATCH] move emit PeerAsymmInfoKey to PeerMain

---
 hbs2-core/lib/HBS2/Net/Proto/EncryptionHandshake.hs | 9 ---------
 hbs2-peer/app/PeerMain.hs                           | 2 ++
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/hbs2-core/lib/HBS2/Net/Proto/EncryptionHandshake.hs b/hbs2-core/lib/HBS2/Net/Proto/EncryptionHandshake.hs
index 4ab3c59b..05763e23 100644
--- a/hbs2-core/lib/HBS2/Net/Proto/EncryptionHandshake.hs
+++ b/hbs2-core/lib/HBS2/Net/Proto/EncryptionHandshake.hs
@@ -94,13 +94,6 @@ encryptionHandshakeProto :: forall e s m .
     , Response e (EncryptionHandshake e) m
     , Request e (EncryptionHandshake e) m
     , Sessions e (KnownPeer e) m
-    -- , Sessions e (EncryptionHandshake e) m
-    -- , HasNonces (EncryptionHandshake e) m
-    -- , HasPeerNonce e m
-    -- , Nonce (EncryptionHandshake e) ~ EENonce
-    -- , Pretty (Peer e)
-    -- , EventEmitter e (EncryptionHandshake e) m
-    , EventEmitter e (PeerAsymmInfo e) m
     , HasCredentials s m
     , Asymm s
     , Signatures s
@@ -151,7 +144,6 @@ encryptionHandshakeProto EncryptionHandshakeAdapter{..} penv = \case
 
       -- Только после этого прописываем его ключ у себя
       encHandshake_considerPeerAsymmKey peer mpeerData (Just theirpubkey)
-      -- emit PeerAsymmInfoKey (PeerAsymmPubKey peer theirpubkey)
 
   AckEncryptionExchange nonce0 theirsign theirpubkey -> do
       peer <- thatPeer proto
@@ -162,7 +154,6 @@ encryptionHandshakeProto EncryptionHandshakeAdapter{..} penv = \case
 
       -- Прописываем его ключ у себя
       encHandshake_considerPeerAsymmKey peer mpeerData (Just theirpubkey)
-      -- emit PeerAsymmInfoKey (PeerAsymmPubKey peer theirpubkey)
 
   where
     proto = Proxy @(EncryptionHandshake e)
diff --git a/hbs2-peer/app/PeerMain.hs b/hbs2-peer/app/PeerMain.hs
index 6150bdcf..d9293c93 100644
--- a/hbs2-peer/app/PeerMain.hs
+++ b/hbs2-peer/app/PeerMain.hs
@@ -648,6 +648,7 @@ runPeer opts = U.handle (\e -> myException e
 
               let encryptionHshakeAdapter ::
                       ( MonadIO m
+                      , EventEmitter e (PeerAsymmInfo e) m
                       ) => EncryptionHandshakeAdapter L4Proto m s
                   encryptionHshakeAdapter = EncryptionHandshakeAdapter
                     { encHandshake_considerPeerAsymmKey = \peer mpeerData -> \case
@@ -655,6 +656,7 @@ runPeer opts = U.handle (\e -> myException e
                             deletePeerAsymmKey brains peer
                             deletePeerSymmKey brains peer
                         Just pk -> do
+                            emit PeerAsymmInfoKey (PeerAsymmPubKey peer pk)
                             insertPeerAsymmKey brains peer pk
                             insertPeerSymmKey brains peer $
                                 genCommonSecret @s