From d0eab68bd2350af6c5d5c2fd4b0ac33f63411bd5 Mon Sep 17 00:00:00 2001
From: Samantha <hello@entropy.cat>
Date: Tue, 10 Mar 2026 16:02:36 -0400
Subject: [PATCH 1/2] test: Remove badNonce retries and increase nonce
 maxConnectionAge

---
 test/chisel2.py               | 24 +++++++-----------------
 test/config-next/nonce-a.json |  2 +-
 test/config-next/nonce-b.json |  2 +-
 test/config/nonce-a.json      |  2 +-
 test/config/nonce-b.json      |  2 +-
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/test/chisel2.py b/test/chisel2.py
index b36de243f13..803971902cc 100644
--- a/test/chisel2.py
+++ b/test/chisel2.py
@@ -14,8 +14,6 @@
 import sys
 import signal
 import threading
-import time
-
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography import x509
@@ -140,21 +138,13 @@ def auth_and_issue(domains, chall_type="dns-01", email=None, cert_output=None, c
     else:
         raise Exception("invalid challenge type %s" % chall_type)
 
-    # Make up to three attempts, retrying on badNonce errors
-    for n in range(3):
-        time.sleep(0.2 * n)  # No sleep before the first attempt, then backoff
-        try:
-            order = client.poll_and_finalize(order)
-            if cert_output is not None:
-                with open(cert_output, "w") as f:
-                    f.write(order.fullchain_pem)
-        except messages.Error as e:
-            if e.typ == "urn:ietf:params:acme:error:badNonce":
-                continue
-        else:
-            break
-        finally:
-            cleanup()
+    try:
+        order = client.poll_and_finalize(order)
+        if cert_output is not None:
+            with open(cert_output, "w") as f:
+                f.write(order.fullchain_pem)
+    finally:
+        cleanup()
 
     return order
 
diff --git a/test/config-next/nonce-a.json b/test/config-next/nonce-a.json
index d14b44063f2..73560a85f44 100644
--- a/test/config-next/nonce-a.json
+++ b/test/config-next/nonce-a.json
@@ -13,7 +13,7 @@
 			"sampleratio": 1
 		},
 		"grpc": {
-			"maxConnectionAge": "30s",
+			"maxConnectionAge": "30m",,
 			"services": {
 				"nonce.NonceService": {
 					"clientNames": [
diff --git a/test/config-next/nonce-b.json b/test/config-next/nonce-b.json
index d14b44063f2..0b1f8c13519 100644
--- a/test/config-next/nonce-b.json
+++ b/test/config-next/nonce-b.json
@@ -13,7 +13,7 @@
 			"sampleratio": 1
 		},
 		"grpc": {
-			"maxConnectionAge": "30s",
+			"maxConnectionAge": "30m",
 			"services": {
 				"nonce.NonceService": {
 					"clientNames": [
diff --git a/test/config/nonce-a.json b/test/config/nonce-a.json
index e549c30ba1e..8fee96485bc 100644
--- a/test/config/nonce-a.json
+++ b/test/config/nonce-a.json
@@ -10,7 +10,7 @@
 		},
 		"debugAddr": ":8111",
 		"grpc": {
-			"maxConnectionAge": "30s",
+			"maxConnectionAge": "30m",,
 			"address": ":9101",
 			"services": {
 				"nonce.NonceService": {
diff --git a/test/config/nonce-b.json b/test/config/nonce-b.json
index e549c30ba1e..8fee96485bc 100644
--- a/test/config/nonce-b.json
+++ b/test/config/nonce-b.json
@@ -10,7 +10,7 @@
 		},
 		"debugAddr": ":8111",
 		"grpc": {
-			"maxConnectionAge": "30s",
+			"maxConnectionAge": "30m",,
 			"address": ":9101",
 			"services": {
 				"nonce.NonceService": {

From 6fccb37b33435ec381568c208d424726148e5b17 Mon Sep 17 00:00:00 2001
From: Samantha <hello@entropy.cat>
Date: Tue, 10 Mar 2026 16:28:43 -0400
Subject: [PATCH 2/2] Now with less punctuation

---
 test/config-next/nonce-a.json | 2 +-
 test/config/nonce-a.json      | 2 +-
 test/config/nonce-b.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/config-next/nonce-a.json b/test/config-next/nonce-a.json
index 73560a85f44..0b1f8c13519 100644
--- a/test/config-next/nonce-a.json
+++ b/test/config-next/nonce-a.json
@@ -13,7 +13,7 @@
 			"sampleratio": 1
 		},
 		"grpc": {
-			"maxConnectionAge": "30m",,
+			"maxConnectionAge": "30m",
 			"services": {
 				"nonce.NonceService": {
 					"clientNames": [
diff --git a/test/config/nonce-a.json b/test/config/nonce-a.json
index 8fee96485bc..562ee79657a 100644
--- a/test/config/nonce-a.json
+++ b/test/config/nonce-a.json
@@ -10,7 +10,7 @@
 		},
 		"debugAddr": ":8111",
 		"grpc": {
-			"maxConnectionAge": "30m",,
+			"maxConnectionAge": "30m",
 			"address": ":9101",
 			"services": {
 				"nonce.NonceService": {
diff --git a/test/config/nonce-b.json b/test/config/nonce-b.json
index 8fee96485bc..562ee79657a 100644
--- a/test/config/nonce-b.json
+++ b/test/config/nonce-b.json
@@ -10,7 +10,7 @@
 		},
 		"debugAddr": ":8111",
 		"grpc": {
-			"maxConnectionAge": "30m",,
+			"maxConnectionAge": "30m",
 			"address": ":9101",
 			"services": {
 				"nonce.NonceService": {