From af27cded195b0350ca5984a3a51177f9d4126025 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Fri, 18 Sep 2020 01:36:02 +0200
Subject: [PATCH] adjust payload parser naming for consistency and clarity

---
 src/Hash2Pub/ASN1Coding.hs | 60 +++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/Hash2Pub/ASN1Coding.hs b/src/Hash2Pub/ASN1Coding.hs
index 6080ff3..e29863e 100644
--- a/src/Hash2Pub/ASN1Coding.hs
+++ b/src/Hash2Pub/ASN1Coding.hs
@@ -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