schmittlauch/Hash2Pub
1
0
Fork 1
Code Issues 47 Pull requests Releases Wiki Activity

fix some warnings

Browse source
This commit is contained in:
Trolli Schmittlauch 2020-03-20 19:26:09 +01:00
parent 84a48e63c2
commit 9d20589cf8
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Hash2Pub/src/Hash2Pub/FediChord.hs
View file

@ -1,4 +1,4 @@
{-# LANGUAGE GeneralizedNewtypeDeriving, DataKinds #-} {-# LANGUAGE GeneralizedNewtypeDeriving, DataKinds, OverloadedStrings #-}
{- | {- |
Module : FediChord Module : FediChord
Description : An opinionated implementation of the EpiChord DHT by Leong et al. Description : An opinionated implementation of the EpiChord DHT by Leong et al.
@ -21,7 +21,6 @@ module Hash2Pub.FediChord (
) where ) where
import qualified Data.Map.Strict as Map import qualified Data.Map.Strict as Map
import qualified Data.String.UTF8 as U8S
import Network.Socket import Network.Socket
import Data.Time.Clock.System import Data.Time.Clock.System
import Control.Exception import Control.Exception
@ -122,13 +121,13 @@ genNodeIDBS :: HostAddress6 -- ^a node's IPv6 address
-> String -- ^a node's 1st and 2nd level domain name -> String -- ^a node's 1st and 2nd level domain name
-> Word8 -- ^the used vserver ID -> Word8 -- ^the used vserver ID
-> BS.ByteString -- ^the NodeID as a 256bit ByteString big-endian unsigned integer -> BS.ByteString -- ^the NodeID as a 256bit ByteString big-endian unsigned integer
genNodeIDBS ipaddr@(a, b, _, _) domain vserver = genNodeIDBS (a, b, _, _) nodeDomain vserver =
hashIpaddrUpper `BS.append` hashID domain' `BS.append` hashIpaddLower hashIpaddrUpper `BS.append` hashID nodeDomain' `BS.append` hashIpaddLower
where where
vsBS = BS.pack [vserver] -- attention: only works for vserver IDs up to 255 vsBS = BS.pack [vserver] -- attention: only works for vserver IDs up to 255
-- TODO: this is inefficient and possibly better done with binary-strict -- TODO: this is inefficient and possibly better done with binary-strict
ipaddrNet = (BL.toStrict . BB.toLazyByteString . mconcat $ map BB.word32BE [a, b]) `BS.append` vsBS ipaddrNet = (BL.toStrict . BB.toLazyByteString . mconcat $ map BB.word32BE [a, b]) `BS.append` vsBS
domain' = BSU.fromString domain `BS.append` vsBS nodeDomain' = BSU.fromString nodeDomain `BS.append` vsBS
hashID bstr = BS.pack . BA.unpack $ (hash bstr :: Digest (SHAKE128 128)) hashID bstr = BS.pack . BA.unpack $ (hash bstr :: Digest (SHAKE128 128))
(hashIpaddrUpper, hashIpaddLower) = BS.splitAt 64 $ hashID ipaddrNet (hashIpaddrUpper, hashIpaddLower) = BS.splitAt 64 $ hashID ipaddrNet
@ -137,7 +136,7 @@ genNodeID :: HostAddress6 -- ^a node's IPv6 address
-> String -- ^a node's 1st and 2nd level domain name -> String -- ^a node's 1st and 2nd level domain name
-> Word8 -- ^the used vserver ID -> Word8 -- ^the used vserver ID
-> NodeID -- ^the generated @NodeID@ -> NodeID -- ^the generated @NodeID@
genNodeID ip domain vs = NodeID . byteStringToUInteger $ genNodeIDBS ip domain vs genNodeID ip nodeDomain vs = NodeID . byteStringToUInteger $ genNodeIDBS ip nodeDomain vs
-- | parses the bit pattern of a ByteString as an unsigned Integer in Big Endian order -- | parses the bit pattern of a ByteString as an unsigned Integer in Big Endian order
@ -146,9 +145,9 @@ byteStringToUInteger :: BS.ByteString -> Integer
byteStringToUInteger bs = sum $ parsedBytes 0 bs byteStringToUInteger bs = sum $ parsedBytes 0 bs
where where
parsedBytes :: Integer -> BS.ByteString -> [ Integer ] parsedBytes :: Integer -> BS.ByteString -> [ Integer ]
parsedBytes offset bs = case BS.unsnoc bs of parsedBytes offset uintBs = case BS.unsnoc uintBs of
Nothing -> [] Nothing -> []
Just (bs, w) -> parseWithOffset offset w : parsedBytes (offset+1) bs Just (bs', w) -> parseWithOffset offset w : parsedBytes (offset+1) bs'
parseWithOffset :: Integer -> Word8 -> Integer parseWithOffset :: Integer -> Word8 -> Integer
parseWithOffset 0 word = toInteger word -- a shift of 0 is always 0 parseWithOffset 0 word = toInteger word -- a shift of 0 is always 0

10
Hash2Pub/test/FediChordSpec.hs
View file

@ -31,11 +31,11 @@ spec = do
pending pending
it "can be generated" $ do it "can be generated" $ do
let let
domain = "example.social" nodeDomain = "example.social"
vs = 4 vs = 4
ip = tupleToHostAddress6 (0x2001, 0x16b8, 0x755a, 0xb110, 0x7d6a, 0x12aab, 0xf0c5, 0x386e) ip = tupleToHostAddress6 (0x2001, 0x16b8, 0x755a, 0xb110, 0x7d6a, 0x12ab, 0xf0c5, 0x386e)
genNodeIDBS ip domain vs `shouldBe` "\ACK\211\183&S\GS\214\247Xn8\216\232\195\247\162\182\253\210\SOHG7I\194\251\196\130\142RSx\219" genNodeIDBS ip nodeDomain vs `shouldBe` "\ACK\211\183&S\GS\214\247Xn8\216\232\195\247\162\182\253\210\SOHG7I\194\251\196\130\142RSx\219"
genNodeID ip domain vs `shouldBe` toNodeID 3087945874980469002564169693112490135217795916629034079089428181202645514459 genNodeID ip nodeDomain vs `shouldBe` toNodeID 3087945874980469002564169693112490135217795916629034079089428181202645514459
describe "ByteString to Integer conversion" $ describe "ByteString to Integer conversion" $
it "correctly interprets ByteStrings as unsigned big-endian integers" $ do it "correctly interprets ByteStrings as unsigned big-endian integers" $ do
@ -47,7 +47,7 @@ spec = do
let ns = NodeState { let ns = NodeState {
nid = toNodeID 12 nid = toNodeID 12
, domain = "herebedragons.social" , domain = "herebedragons.social"
, ipAddr = (0x200116b8, 0x755ab1100, 0x7d6a12ab, 0xf0c5386e) , ipAddr = tupleToHostAddress6 (0x2001, 0x16b8, 0x755a, 0xb110, 0x7d6a, 0x12ab, 0xf0c5, 0x386e)
, dhtPort = 2342 , dhtPort = 2342
, apPort = Nothing , apPort = Nothing
, nodeCache = Map.empty , nodeCache = Map.empty