Merge branch 'v0.6' into issue_1277

src/network/bmproto.py

@@ -300,7 +300,7 @@ class BMProto(AdvancedDispatcher, ObjectTracker):
     def _command_inv(self, dandelion=False):
         items = self.decode_payload_content("l32s")
 
-        if len(items) >= BMProto.maxObjectCount:
+        if len(items) > BMProto.maxObjectCount:
             logger.error("Too many items in %sinv message!", "d" if dandelion else "")
             raise BMProtoExcessiveDataError()
         else:

src/network/tcp.py

@@ -180,7 +180,11 @@ class TCPConnection(BMProto, TLSDispatcher):
         for hash, storedValue in bigInvList.items():
             payload += hash
             objectCount += 1
-            if objectCount >= BMProto.maxObjectCount:
+
+            # Remove -1 below when sufficient time has passed for users to
+            # upgrade to versions of PyBitmessage that accept inv with 50,000
+            # items
+            if objectCount >= BMProto.maxObjectCount - 1:
                 sendChunk()
                 payload = b''
                 objectCount = 0