Make publications reliable by default

Author: pavel-kirienko

cynic.py

@@ -26,7 +26,6 @@
 
 HOME = "cynic/"  # Trailing slash to generate a unique home.
 DEFAULT_TIMEOUT = 10.0
-CONSENSUS_SYNC_DELAY = 0.3
 SCOUT_PATTERN = "/>"
 
 _logger = logging.getLogger("cynic")
@@ -107,10 +106,9 @@ async def cmd_sub(node: Node, args: argparse.Namespace) -> int:
 async def cmd_pub(node: Node, args: argparse.Namespace) -> int:
     pubs = [node.advertise(x) for x in args.topic]
     try:
-        await asyncio.sleep(CONSENSUS_SYNC_DELAY)
         deadline = Instant.now() + args.timeout
         message = unescape(args.data)
-        await asyncio.gather(*(pub(deadline, message, reliable=args.reliable) for pub in pubs))
+        await asyncio.gather(*(pub(deadline, message, reliable=True) for pub in pubs))
         _logger.info("Published on %s", args.topic)
     finally:
         for pub in pubs:
@@ -147,7 +145,6 @@ async def request(pub: Publisher, timeout: float, message: bytes) -> int:
 async def cmd_req(node: Node, args: argparse.Namespace) -> int:
     pubs = [node.advertise(x) for x in args.topic]
     try:
-        await asyncio.sleep(CONSENSUS_SYNC_DELAY)
         message = unescape(args.data)
         counts = await asyncio.gather(*(request(pub, args.timeout, message) for pub in pubs))
     finally:
@@ -224,7 +221,6 @@ def main() -> int:
     p_sub.set_defaults(func=cmd_sub)
 
     p_pub = sub.add_parser("pub", help="publish DATA on each TOPIC once")
-    p_pub.add_argument("-r", "--reliable", action="store_true")
     p_pub.add_argument("topic", nargs="+")
     p_pub.add_argument("data", help=r"hex-escape-encoded, e.g. 'hello\x0dworld!\n'")
     p_pub.set_defaults(func=cmd_pub)

tests/test_cynic.py

@@ -233,20 +233,22 @@ def test_sub_multiple_topics_independently(tmp_path: Path, link: list[str]) -> N
     assert all(payload_eq(by_topic[t], f"msg{i}".encode()) for i, t in enumerate(topics))
 
 
-def test_pub_reliable_with_subscriber(subscriber: Subscriber, link: list[str], topic: str) -> None:
-    assert run_cynic(link, "pub", "-r", topic, "ack me").returncode == 0
+def test_pub_with_subscriber(subscriber: Subscriber, link: list[str], topic: str) -> None:
+    assert run_cynic(link, "pub", topic, "ack me").returncode == 0
     (msg,) = collect(subscriber.out, 1, SETTLE)
     assert payload_eq(cynic.unescape(msg["msg"]), b"ack me")
 
 
 def test_pub_reliable_without_subscriber(link: list[str], topic: str) -> None:
-    r = run_cynic(link, "pub", "-r", topic, "nobody home")
+    r = run_cynic(link, "pub", topic, "nobody home")
     assert r.returncode == 1
     assert "DeliveryError" in r.stderr
 
 
-def test_pub_best_effort_without_subscriber(link: list[str], topic: str) -> None:
-    assert run_cynic(link, "pub", topic, "into the void").returncode == 0
+def test_pub_reliability_flag_is_removed(link: list[str], topic: str) -> None:
+    r = run_cynic(link, "pub", "--reliable", topic, "deprecated")
+    assert r.returncode == 2
+    assert "unrecognized arguments: --reliable" in r.stderr
 
 
 @contextlib.contextmanager