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

adjust payload parser naming for consistency and clarity

Browse source
This commit is contained in:
Trolli Schmittlauch 2020-09-18 01:36:02 +02:00
parent 41aaa8ff70
commit af27cded19
1 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/Hash2Pub/ASN1Coding.hs
View file

@ -279,11 +279,11 @@ parseRequest action = do
isFinalPart <- parseBool isFinalPart <- parseBool
hasPayload <- hasNext hasPayload <- hasNext
payload <- if not hasPayload then pure Nothing else Just <$> case action of payload <- if not hasPayload then pure Nothing else Just <$> case action of
QueryID -> parseQueryIDRequest QueryID -> parseQueryIDRequestPayload
Join -> parseJoinRequest Join -> parseJoinRequestPayload
Leave -> parseLeaveRequest Leave -> parseLeaveRequestPayload
Stabilise -> parseStabiliseRequest Stabilise -> parseStabiliseRequestPayload
Ping -> parsePingRequest Ping -> parsePingRequestPayload
QueryLoad -> parseLoadRequestPayload QueryLoad -> parseLoadRequestPayload
pure $ Request requestID sender part isFinalPart action payload pure $ Request requestID sender part isFinalPart action payload
@ -296,11 +296,11 @@ parseResponse requestID = do
action <- parseEnum :: ParseASN1 Action action <- parseEnum :: ParseASN1 Action
hasPayload <- hasNext hasPayload <- hasNext
payload <- if not hasPayload then pure Nothing else Just <$> case action of payload <- if not hasPayload then pure Nothing else Just <$> case action of
QueryID -> parseQueryIDResponse QueryID -> parseQueryIDResponsePayload
Join -> parseJoinResponse Join -> parseJoinResponsePayload
Leave -> parseLeaveResponse Leave -> parseLeaveResponsePayload
Stabilise -> parseStabiliseResponse Stabilise -> parseStabiliseResponsePayload
Ping -> parsePingResponse Ping -> parsePingResponsePayload
QueryLoad -> parseLoadResponsePayload QueryLoad -> parseLoadResponsePayload
pure $ Response requestID senderID part isFinalPart action payload pure $ Response requestID senderID part isFinalPart action payload
@ -381,13 +381,13 @@ parseCacheEntry = onNextContainer Sequence $ do
parseNodeCache :: ParseASN1 [RemoteCacheEntry] parseNodeCache :: ParseASN1 [RemoteCacheEntry]
parseNodeCache = onNextContainer Sequence $ getMany parseCacheEntry parseNodeCache = onNextContainer Sequence $ getMany parseCacheEntry
parseJoinRequest :: ParseASN1 ActionPayload parseJoinRequestPayload :: ParseASN1 ActionPayload
parseJoinRequest = do parseJoinRequestPayload = do
parseNull parseNull
pure JoinRequestPayload pure JoinRequestPayload
parseJoinResponse :: ParseASN1 ActionPayload parseJoinResponsePayload :: ParseASN1 ActionPayload
parseJoinResponse = onNextContainer Sequence $ do parseJoinResponsePayload = onNextContainer Sequence $ do
succ' <- onNextContainer Sequence (getMany parseNodeState) succ' <- onNextContainer Sequence (getMany parseNodeState)
pred' <- onNextContainer Sequence (getMany parseNodeState) pred' <- onNextContainer Sequence (getMany parseNodeState)
cache <- parseNodeCache cache <- parseNodeCache
@ -397,8 +397,8 @@ parseJoinResponse = onNextContainer Sequence $ do
, joinCache = cache , joinCache = cache
} }
parseQueryIDRequest :: ParseASN1 ActionPayload parseQueryIDRequestPayload :: ParseASN1 ActionPayload
parseQueryIDRequest = onNextContainer Sequence $ do parseQueryIDRequestPayload = onNextContainer Sequence $ do
targetID <- fromInteger <$> parseInteger targetID <- fromInteger <$> parseInteger
lBestNodes <- parseInteger lBestNodes <- parseInteger
pure $ QueryIDRequestPayload { pure $ QueryIDRequestPayload {
@ -406,8 +406,8 @@ parseQueryIDRequest = onNextContainer Sequence $ do
, queryLBestNodes = lBestNodes , queryLBestNodes = lBestNodes
} }
parseQueryIDResponse :: ParseASN1 ActionPayload parseQueryIDResponsePayload :: ParseASN1 ActionPayload
parseQueryIDResponse = onNextContainer Sequence $ do parseQueryIDResponsePayload = onNextContainer Sequence $ do
Enumerated resultType <- getNext Enumerated resultType <- getNext
result <- case resultType of result <- case resultType of
0 -> FOUND <$> parseNodeState 0 -> FOUND <$> parseNodeState
@ -417,13 +417,13 @@ parseQueryIDResponse = onNextContainer Sequence $ do
queryResult = result queryResult = result
} }
parseStabiliseRequest :: ParseASN1 ActionPayload parseStabiliseRequestPayload :: ParseASN1 ActionPayload
parseStabiliseRequest = do parseStabiliseRequestPayload = do
parseNull parseNull
pure StabiliseRequestPayload pure StabiliseRequestPayload
parseStabiliseResponse :: ParseASN1 ActionPayload parseStabiliseResponsePayload :: ParseASN1 ActionPayload
parseStabiliseResponse = onNextContainer Sequence $ do parseStabiliseResponsePayload = onNextContainer Sequence $ do
succ' <- onNextContainer Sequence (getMany parseNodeState) succ' <- onNextContainer Sequence (getMany parseNodeState)
pred' <- onNextContainer Sequence (getMany parseNodeState) pred' <- onNextContainer Sequence (getMany parseNodeState)
pure $ StabiliseResponsePayload { pure $ StabiliseResponsePayload {
@ -431,8 +431,8 @@ parseStabiliseResponse = onNextContainer Sequence $ do
, stabilisePredecessors = pred' , stabilisePredecessors = pred'
} }
parseLeaveRequest :: ParseASN1 ActionPayload parseLeaveRequestPayload :: ParseASN1 ActionPayload
parseLeaveRequest = onNextContainer Sequence $ do parseLeaveRequestPayload = onNextContainer Sequence $ do
succ' <- onNextContainer Sequence (getMany parseNodeState) succ' <- onNextContainer Sequence (getMany parseNodeState)
pred' <- onNextContainer Sequence (getMany parseNodeState) pred' <- onNextContainer Sequence (getMany parseNodeState)
doMigration <- parseBool doMigration <- parseBool
@ -442,18 +442,18 @@ parseLeaveRequest = onNextContainer Sequence $ do
, leaveDoMigration = doMigration , leaveDoMigration = doMigration
} }
parseLeaveResponse :: ParseASN1 ActionPayload parseLeaveResponsePayload :: ParseASN1 ActionPayload
parseLeaveResponse = do parseLeaveResponsePayload = do
parseNull parseNull
pure LeaveResponsePayload pure LeaveResponsePayload
parsePingRequest :: ParseASN1 ActionPayload parsePingRequestPayload :: ParseASN1 ActionPayload
parsePingRequest = do parsePingRequestPayload = do
parseNull parseNull
pure PingRequestPayload pure PingRequestPayload
parsePingResponse :: ParseASN1 ActionPayload parsePingResponsePayload :: ParseASN1 ActionPayload
parsePingResponse = onNextContainer Sequence $ do parsePingResponsePayload = onNextContainer Sequence $ do
handledNodes <- getMany parseNodeState handledNodes <- getMany parseNodeState
pure $ PingResponsePayload { pure $ PingResponsePayload {
pingNodeStates = handledNodes pingNodeStates = handledNodes