diff options
| author | Roman Smrž <roman.smrz@seznam.cz> | 2025-07-29 10:04:33 +0200 |
|---|---|---|
| committer | Roman Smrž <roman.smrz@seznam.cz> | 2025-07-29 10:04:33 +0200 |
| commit | 44094e8f19ad410ac7fc78ddbc9e18f42bc3cf62 (patch) | |
| tree | 38d95556e0b141afff0f6ee480cd41538bfa6afe /src | |
| parent | d8160f03094e6d18509956efe9bb6aeda31d79c5 (diff) | |
Rename peerIdentity to getPeerIdentity
Changelog: API: Renamed `Network.peerIdentity` to `getPeerIdentity`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Erebos/Discovery.hs | 2 | ||||
| -rw-r--r-- | src/Erebos/Network.hs | 14 | ||||
| -rw-r--r-- | src/Erebos/Pairing.hs | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/Erebos/Discovery.hs b/src/Erebos/Discovery.hs index a83e589..5590e4c 100644 --- a/src/Erebos/Discovery.hs +++ b/src/Erebos/Discovery.hs @@ -570,7 +570,7 @@ discoverySearch :: (MonadIO m, MonadError e m, FromErebosError e) => Server -> R discoverySearch server dgst = do peers <- liftIO $ getCurrentPeerList server match <- forM peers $ \peer -> do - peerIdentity peer >>= \case + getPeerIdentity peer >>= \case PeerIdentityFull pid -> do return $ dgst `elem` identityDigests pid _ -> return False diff --git a/src/Erebos/Network.hs b/src/Erebos/Network.hs index 63ce7b8..7f9b060 100644 --- a/src/Erebos/Network.hs +++ b/src/Erebos/Network.hs @@ -9,7 +9,7 @@ module Erebos.Network ( Peer, peerServer, peerStorage, PeerAddress(..), getPeerAddress, getPeerAddresses, - PeerIdentity(..), peerIdentity, + PeerIdentity(..), getPeerIdentity, WaitingRef, wrDigest, Service(..), @@ -202,12 +202,14 @@ instance Ord PeerAddress where compare (DatagramAddress addr) (DatagramAddress addr') = compare addr addr' -data PeerIdentity = PeerIdentityUnknown (TVar [UnifiedIdentity -> ExceptT ErebosError IO ()]) - | PeerIdentityRef WaitingRef (TVar [UnifiedIdentity -> ExceptT ErebosError IO ()]) - | PeerIdentityFull UnifiedIdentity +data PeerIdentity + = PeerIdentityUnknown (TVar [ UnifiedIdentity -> ExceptT ErebosError IO () ]) + | PeerIdentityRef WaitingRef (TVar [ UnifiedIdentity -> ExceptT ErebosError IO () ]) + | PeerIdentityFull UnifiedIdentity -peerIdentity :: MonadIO m => Peer -> m PeerIdentity -peerIdentity = liftIO . atomically . readTVar . peerIdentityVar +-- | Get currently known identity of the given peer +getPeerIdentity :: MonadIO m => Peer -> m PeerIdentity +getPeerIdentity = liftIO . atomically . readTVar . peerIdentityVar data PeerState diff --git a/src/Erebos/Pairing.hs b/src/Erebos/Pairing.hs index e3ebf2b..d1fdc79 100644 --- a/src/Erebos/Pairing.hs +++ b/src/Erebos/Pairing.hs @@ -209,7 +209,7 @@ pairingRequest :: forall a m e proxy. (PairingResult a, MonadIO m, MonadError e pairingRequest _ peer = do self <- liftIO $ serverIdentity $ peerServer peer nonce <- liftIO $ getRandomBytes 32 - pid <- peerIdentity peer >>= \case + pid <- getPeerIdentity peer >>= \case PeerIdentityFull pid -> return pid _ -> throwOtherError "incomplete peer identity" sendToPeerWith @(PairingService a) peer $ \case |