voidlizard
/
hbs2
mirror of https://github.com/voidlizard/hbs2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "rpc-own-peer-key" 

This reverts commit 5be6292a76.
This commit is contained in:
Dmitry Zuikov 2023-02-15 12:21:21 +03:00
parent 5f32229bef
commit 83f0688688
4 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.fixme/log
View File

@ -162,5 +162,3 @@ fixme-set "workflow" "test" "84iLJsvCtT"
fixme-set "workflow" "wip" "GkCkjVMAXW" fixme-set "workflow" "wip" "GkCkjVMAXW"
fixme-set "workflow" "test" "GkCkjVMAXW" fixme-set "workflow" "test" "GkCkjVMAXW"
fixme-set "workflow" "test" "t8M3AEnm93"

4
docs/devlog.md
View File

@ -1,10 +1,6 @@
## 2023-02-15 ## 2023-02-15
TODO: rpc-own-peer-key
poke to print peer's own auth key
TODO: rpc-known-peers TODO: rpc-known-peers
TODO: announce-group TODO: announce-group

12
hbs2-peer/app/PeerMain.hs
View File

@ -538,11 +538,7 @@ runPeer opts = Exception.handle myException $ do
void $ liftIO $ waitAnyCatchCancel workers void $ liftIO $ waitAnyCatchCancel workers
let pokeAction _ = do let pokeAction _ = do
who <- thatPeer (Proxy @(RPC e))
let k = view peerSignPk pc
-- FIXME: to-delete-POKE
liftIO $ atomically $ writeTQueue rpcQ POKE liftIO $ atomically $ writeTQueue rpcQ POKE
request who (RPCPokeAnswer @e k)
let annAction h = do let annAction h = do
liftIO $ atomically $ writeTQueue rpcQ (ANNOUNCE h) liftIO $ atomically $ writeTQueue rpcQ (ANNOUNCE h)
@ -658,9 +654,6 @@ withRPC saddr cmd = do
Log.info $ "pong from" <+> pretty pa Log.info $ "pong from" <+> pretty pa
exitSuccess exitSuccess
RPCPoke{} -> pause @'Seconds 0.1
RPCPeers{} -> liftIO do RPCPeers{} -> liftIO do
pause @'Seconds 1 pause @'Seconds 1
exitSuccess exitSuccess
@ -673,10 +666,7 @@ withRPC saddr cmd = do
where where
adapter q = RpcAdapter dontHandle adapter q = RpcAdapter dontHandle
(const $ notice "alive-and-kicking" >> liftIO exitSuccess)
(\k -> do Log.info ( "alive-and-kicking" <+> pretty (AsBase58 k))
liftIO exitSuccess )
(const $ liftIO exitSuccess) (const $ liftIO exitSuccess)
(const $ notice "ping?") (const $ notice "ping?")
(liftIO . atomically . writeTQueue q) (liftIO . atomically . writeTQueue q)

8
hbs2-peer/app/RPC.hs
View File

@ -19,7 +19,7 @@ data RPC e =
RPCPoke RPCPoke
| RPCPing (PeerAddr e) | RPCPing (PeerAddr e)
| RPCPong (PeerAddr e) | RPCPong (PeerAddr e)
| RPCPokeAnswer (PubKey 'Sign e) | RPCPokeAnswer
| RPCAnnounce (Hash HbSync) | RPCAnnounce (Hash HbSync)
| RPCFetch (Hash HbSync) | RPCFetch (Hash HbSync)
| RPCPeers | RPCPeers
@ -47,7 +47,7 @@ makeLenses 'RPCEnv
data RpcAdapter e m = data RpcAdapter e m =
RpcAdapter RpcAdapter
{ rpcOnPoke :: RPC e -> m () { rpcOnPoke :: RPC e -> m ()
, rpcOnPokeAnswer :: PubKey 'Sign e -> m () , rpcOnPokeAnswer :: RPC e -> m ()
, rpcOnAnnounce :: Hash HbSync -> m () , rpcOnAnnounce :: Hash HbSync -> m ()
, rpcOnPing :: PeerAddr e -> m () , rpcOnPing :: PeerAddr e -> m ()
, rpcOnPong :: PeerAddr e -> m () , rpcOnPong :: PeerAddr e -> m ()
@ -94,8 +94,8 @@ rpcHandler :: forall e m . ( MonadIO m
=> RpcAdapter e m -> RPC e -> m () => RpcAdapter e m -> RPC e -> m ()
rpcHandler adapter = \case rpcHandler adapter = \case
p@RPCPoke{} -> rpcOnPoke adapter p p@RPCPoke{} -> rpcOnPoke adapter p >> response (RPCPokeAnswer @e)
(RPCPokeAnswer k) -> rpcOnPokeAnswer adapter k p@RPCPokeAnswer{} -> rpcOnPokeAnswer adapter p
(RPCAnnounce h) -> rpcOnAnnounce adapter h (RPCAnnounce h) -> rpcOnAnnounce adapter h
(RPCPing pa) -> rpcOnPing adapter pa (RPCPing pa) -> rpcOnPing adapter pa
(RPCPong pa) -> rpcOnPong adapter pa (RPCPong pa) -> rpcOnPong adapter pa