Merge pull request #1315 from tahoe-lafs/4046.nurls-are-set

Make NURLs a set Fixes ticket:4046
tahoe-lafs · Jul 20, 2023 · f7f30c7 · f7f30c7
2 parents 7bcd90c + aa144fc
commit f7f30c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/newsfragments/4046.minor b/newsfragments/4046.minor
diff --git a/src/allmydata/client.py b/src/allmydata/client.py
@@ -837,7 +837,11 @@ def init_storage(self, announceable_storage_servers):
             if hasattr(self.tub.negotiationClass, "add_storage_server"):
                 nurls = self.tub.negotiationClass.add_storage_server(ss, swissnum.encode("ascii"))
                 self.storage_nurls = nurls
-                announcement[storage_client.ANONYMOUS_STORAGE_NURLS] = [n.to_text() for n in nurls]
+                # There is code in e.g. storage_client.py that checks if an
+                # announcement has changed. Since NURL order isn't meaningful,
+                # we don't want a change in the order to count as a change, so we
+                # send the NURLs as a set. CBOR supports sets, as does Foolscap.
+                announcement[storage_client.ANONYMOUS_STORAGE_NURLS] = {n.to_text() for n in nurls}
             announcement["anonymous-storage-FURL"] = furl
 
         enabled_storage_servers = self._enable_storage_servers(