Remove SizeInBytes from ObjectDiffusion

Author: tbagrel1

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

@@ -137,16 +137,15 @@ encodeObjectDiffusion encodeObjectId encodeObject = encode
         <> CBOR.encodeWord 1
         <> CBOR.encodeListLenIndef
         <> foldr
-          ( \(objId, SizeInBytes sz) r ->
+          ( \objId r ->
               CBOR.encodeListLen 2
                 <> encodeObjectId objId
-                <> CBOR.encodeWord32 sz
                 <> r
           )
           CBOR.encodeBreak
           objIds'
       where
-        objIds' :: [(objectId, SizeInBytes)]
+        objIds' :: [objectId]
         objIds' = case objIds of
           BlockingReply xs -> NonEmpty.toList xs
           NonBlockingReply xs -> xs
@@ -204,9 +203,7 @@ decodeObjectDiffusion decodeObjectId decodeObject = decode
               reverse
               ( do
                   CBOR.decodeListLenOf 2
-                  objId <- decodeObjectId
-                  sz <- CBOR.decodeWord32
-                  return (objId, SizeInBytes sz)
+                  decodeObjectId
               )
           case (b, objIds) of
             (SingBlocking, t : ts) ->

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

@@ -42,7 +42,7 @@ data ObjectDiffusionInboundPipelined objectId object m a where
 data Collect objectId object
   = -- | The result of 'SendMsgRequestObjectIdsPipelined'. It also carries
     -- the number of objectIds originally requested.
-    CollectObjectIds NumObjectIdsToReq [(objectId, SizeInBytes)]
+    CollectObjectIds NumObjectIdsToReq [objectId]
   | -- | The result of 'SendMsgRequestObjectsPipelined'. The actual reply only
     -- contains the objects sent, but this pairs them up with the
     -- objects requested. This is because the peer can determine that
@@ -57,7 +57,7 @@ data InboundStIdle (n :: N) objectId object m a where
     NumObjectIdsToReq ->
     -- | Result if done
     m a ->
-    ( NonEmpty (objectId, SizeInBytes) ->
+    ( NonEmpty objectId ->
       m (InboundStIdle Z objectId object m a)
     ) ->
     InboundStIdle Z objectId object m a

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

@@ -64,7 +64,7 @@ data OutboundStIdle objectId object m a = OutboundStIdle
 
 data OutboundStObjectIds blocking objectId object m a where
   SendMsgReplyObjectIds ::
-    BlockingReplyList blocking (objectId, SizeInBytes) ->
+    BlockingReplyList blocking objectId ->
     OutboundStIdle objectId object m a ->
     OutboundStObjectIds blocking objectId object m a
   -- | In the blocking case, the outbound can terminate the protocol. This could

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

@@ -272,7 +272,7 @@ instance Protocol (ObjectDiffusion initAgency objectId object) where
     -- order in which they are submitted to the mempool, to preserve dependent
     -- objects.
     MsgReplyObjectIds ::
-      BlockingReplyList blocking (objectId, SizeInBytes) ->
+      BlockingReplyList blocking objectId ->
       Message (ObjectDiffusion initAgency objectId object) (StObjectIds blocking) StIdle
     -- \| Request one or more objects corresponding to the given object
     -- identifiers.

ouroboros-network/src/Ouroboros/Network/NodeToNode.hs

@@ -102,7 +102,6 @@ import Ouroboros.Network.Server.RateLimiting
 import Ouroboros.Network.Snocket
 import Ouroboros.Network.Socket
 import Ouroboros.Network.Util.ShowProxy (ShowProxy, showProxy)
-import Ouroboros.Network.Protocol.ObjectDiffusion.Type (NumObjectIdsToAck)
 import Ouroboros.Network.Protocol.ObjectDiffusion.Type (NumObjectsInFifo)