Some more name adjustments

Author: tbagrel1

ouroboros-network-protocols/src/Ouroboros/Network/Protocol/ObjectDiffusion/Codec.hs

@@ -122,7 +122,7 @@ encodeObjectDiffusion encodeObjectId encodeObject = encode
     encode MsgInit =
       CBOR.encodeListLen 1
         <> CBOR.encodeWord 6
-    encode (MsgRequestObjectIds blocking (NumObjectIdsToAck ackNo) (NumObjectIdsToReq reqNo)) =
+    encode (MsgRequestObjectIds blocking (NumObjectIdsAck ackNo) (NumObjectIdsReq reqNo)) =
       CBOR.encodeListLen 4
         <> CBOR.encodeWord 0
         <> CBOR.encodeBool
@@ -189,8 +189,8 @@ decodeObjectDiffusion decodeObjectId decodeObject = decode
           return (SomeMessage MsgInit)
         (SingIdle, 4, 0) -> do
           blocking <- CBOR.decodeBool
-          ackNo <- NumObjectIdsToAck <$> CBOR.decodeWord16
-          reqNo <- NumObjectIdsToReq <$> CBOR.decodeWord16
+          ackNo <- NumObjectIdsAck <$> CBOR.decodeWord16
+          reqNo <- NumObjectIdsReq <$> CBOR.decodeWord16
           return $! case blocking of
             True -> SomeMessage (MsgRequestObjectIds SingBlocking ackNo reqNo)
             False -> SomeMessage (MsgRequestObjectIds SingNonBlocking ackNo reqNo)

ouroboros-network-protocols/src/Ouroboros/Network/Protocol/ObjectDiffusion/Type.hs

@@ -158,28 +158,28 @@ data StBlockingStyle where
   -- | In this state the peer must reply. There is a timeout.
   StNonBlocking :: StBlockingStyle
 
-newtype NumObjectIdsAck = NumObjectIdsToAck {getNumObjectIdsToAck :: Word16}
+newtype NumObjectIdsAck = NumObjectIdsAck {getNumObjectIdsAck :: Word16}
   deriving (Eq, Ord, NFData, Generic)
   deriving newtype (Num, Enum, Real, Integral, Bounded, NoThunks)
   deriving (Semigroup) via (Sum Word16)
   deriving (Monoid) via (Sum Word16)
   deriving (Show) via (Quiet NumObjectIdsAck  )
 
-newtype NumObjectIdsReq = NumObjectIdsToReq {getNumObjectIdsToReq :: Word16}
+newtype NumObjectIdsReq = NumObjectIdsReq {getNumObjectIdsReq :: Word16}
   deriving (Eq, Ord, NFData, Generic)
   deriving newtype (Num, Enum, Real, Integral, Bounded, NoThunks)
   deriving (Semigroup) via (Sum Word16)
   deriving (Monoid) via (Sum Word16)
   deriving (Show) via (Quiet NumObjectIdsReq  )
 
-newtype NumObjectsReq = NumObjectsToReq {getNumObjectsToReq :: Word16}
+newtype NumObjectsReq = NumObjectsReq {getNumObjectsReq :: Word16}
   deriving (Eq, Ord, NFData, Generic)
   deriving newtype (Num, Enum, Real, Integral, Bounded, NoThunks)
   deriving (Semigroup) via (Sum Word16)
   deriving (Monoid) via (Sum Word16)
   deriving (Show) via (Quiet NumObjectsReq  )
 
-newtype NumObjectsOutstanding = NumObjectsInFifo {getNumObjectsInFifo :: Word16}
+newtype NumObjectsOutstanding = NumObjectsOutstanding {getNumObjectsOutstanding :: Word16}
   deriving (Eq, Ord, NFData, Generic)
   deriving newtype (Num, Enum, Real, Integral, Bounded, NoThunks)
   deriving (Semigroup) via (Sum Word16)