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