]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
chore: Clean up unused variables 16453/head
authorJosh Soref <2119212+jsoref@users.noreply.github.com>
Fri, 7 Nov 2025 11:14:55 +0000 (06:14 -0500)
committerJosh Soref <2119212+jsoref@users.noreply.github.com>
Fri, 7 Nov 2025 18:14:50 +0000 (13:14 -0500)
- Change get_rust_struct_fields_from_definition to use `indent`

  All callers were maintaining it, get_rust_struct_from_definition had updated it but left it unused...

- Fix type annotations
- Remove dead code for `response`
- Remove dead code for `url`
- Remove dead code for `wire`
- Remove unused timing
- Remove unused variable `data`
- Remove unused variable `dropped`
- Remove unused variable `fileContent`
- Remove unused variable `message`
- Remove unused variable `method`
- Remove unused variable `name`
- Remove unused variable `numberOfQueries`
- Remove unused variable `output`
- Remove unused variable `pbMessageType`
- Remove unused variable `rcode`
- Remove unused variable `secondSerial`
- Remove unused variable `total`

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
15 files changed:
pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py
regression-tests.dnsdist/dnsdisttests.py
regression-tests.dnsdist/doh3client.py
regression-tests.dnsdist/quictests.py
regression-tests.dnsdist/test_API.py
regression-tests.dnsdist/test_Advanced.py
regression-tests.dnsdist/test_Basics.py
regression-tests.dnsdist/test_DNSCrypt.py
regression-tests.dnsdist/test_DOH.py
regression-tests.dnsdist/test_DOQ.py
regression-tests.dnsdist/test_Protobuf.py
regression-tests.dnsdist/test_ProxyProtocol.py
regression-tests.dnsdist/test_Routing.py
regression-tests.dnsdist/test_TCPKeepAlive.py
regression-tests.dnsdist/test_TCPLimits.py

index 04529c4a70c273261ad7e5351351a1db79ca072f..6d430d7aaadce234f5d679e7070c0417f4a48b16 100644 (file)
@@ -203,11 +203,10 @@ def get_converted_serde_type(rust_type):
 
     return f'dnsdistsettings::{rust_type}'
 
-def get_rust_struct_fields_from_definition(name, keys, default_functions, indent_spaces, special_serde_object=False):
+def get_rust_struct_fields_from_definition(name, keys, default_functions, indent, special_serde_object=False):
     if not 'parameters' in keys:
         return ''
     output = ''
-    indent = ' '*indent_spaces
     for parameter in keys['parameters']:
         parameter_name = get_rust_field_name(parameter['name']) if not 'rename' in parameter else parameter['rename']
         rust_type = parameter['type']
@@ -252,7 +251,7 @@ def get_rust_struct_from_definition(name, keys, default_functions, indent_spaces
 '''
     indent_spaces += 4
     indent = ' '*indent_spaces
-    output += get_rust_struct_fields_from_definition(name, keys, default_functions, indent_spaces, special_serde_object=special_serde_object)
+    output += get_rust_struct_fields_from_definition(name, keys, default_functions, indent, special_serde_object=special_serde_object)
     output += '    }\n'
     if special_serde_object or not 'skip-serde' in keys or not keys['skip-serde']:
         default_functions.append(write_rust_default_trait_impl(f'{obj_name}Configuration{name_suffix}', special_serde_object))
@@ -401,7 +400,7 @@ def generate_actions_config(output, def_dir, response, default_functions):
             action_buffer += f'{indent}#[serde(default, skip_serializing_if = "crate::is_default")]\n'
         action_buffer += f'{indent}name: String,\n'
 
-        action_buffer += get_rust_struct_fields_from_definition(struct_name, action, default_functions, 8)
+        action_buffer += get_rust_struct_fields_from_definition(struct_name, action, default_functions, indent)
 
         action_buffer += '    }\n\n'
 
@@ -428,7 +427,7 @@ def generate_selectors_config(output, def_dir, default_functions):
             selector_buffer += f'{indent}#[serde(default, skip_serializing_if = "crate::is_default")]\n'
         selector_buffer += f'{indent}name: String,\n'
 
-        selector_buffer += get_rust_struct_fields_from_definition(struct_name, selector, default_functions, 8)
+        selector_buffer += get_rust_struct_fields_from_definition(struct_name, selector, default_functions, indent)
 
         selector_buffer += '    }\n\n'
 
index 4f521c0b6eda403861bc7a88418e8a8b648d6e46..36ab4c51ba8ab3b5341b82707d0f7f083f895102 100644 (file)
@@ -969,17 +969,15 @@ class DNSDistTest(AssertEqualDNSMessageMixin, unittest.TestCase):
     def generateNewCertificateAndKey(filePrefix):
         # generate and sign a new cert
         cmd = ['openssl', 'req', '-new', '-newkey', 'rsa:2048', '-nodes', '-keyout', filePrefix + '.key', '-out', filePrefix + '.csr', '-config', 'configServer.conf']
-        output = None
         try:
             process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
-            output = process.communicate(input='')
+            process.communicate(input='')
         except subprocess.CalledProcessError as exc:
             raise AssertionError('openssl req failed (%d): %s' % (exc.returncode, exc.output))
         cmd = ['openssl', 'x509', '-req', '-days', '1', '-CA', 'ca.pem', '-CAkey', 'ca.key', '-CAcreateserial', '-in', filePrefix + '.csr', '-out', filePrefix + '.pem', '-extfile', 'configServer.conf', '-extensions', 'v3_req']
-        output = None
         try:
             process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
-            output = process.communicate(input='')
+            process.communicate(input='')
         except subprocess.CalledProcessError as exc:
             raise AssertionError('openssl x509 failed (%d): %s' % (exc.returncode, exc.output))
 
@@ -989,10 +987,9 @@ class DNSDistTest(AssertEqualDNSMessageMixin, unittest.TestCase):
                     outFile.write(inFile.read())
 
         cmd = ['openssl', 'pkcs12', '-export', '-passout', 'pass:passw0rd', '-clcerts', '-in', filePrefix + '.pem', '-CAfile', 'ca.pem', '-inkey', filePrefix + '.key', '-out', filePrefix + '.p12']
-        output = None
         try:
             process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
-            output = process.communicate(input='')
+            process.communicate(input='')
         except subprocess.CalledProcessError as exc:
             raise AssertionError('openssl pkcs12 failed (%d): %s' % (exc.returncode, exc.output))
 
index e2e2bc107ad685dd4f63b4c52ba9d4bfb16db005..15e6d794794a86209dd13d4d70710457f04dbb9e 100644 (file)
@@ -9,7 +9,7 @@ import time
 import async_timeout
 
 from collections import deque
-from typing import BinaryIO, Callable, Deque, Dict, List, Optional, Union, cast
+from typing import BinaryIO, Callable, Deque, Dict, List, Optional, Tuple, Union, cast
 from urllib.parse import urlparse
 
 import aioquic
@@ -157,9 +157,8 @@ async def perform_http_request(
     include: bool,
     output_dir: Optional[str],
     additional_headers: Optional[Dict] = None,
-) -> None:
+) -> Tuple[str, Dict[str, str]]:
     # perform request
-    start = time.time()
     if data is not None:
         headers = copy.deepcopy(additional_headers) if additional_headers else {}
         headers["content-length"] = str(len(data))
@@ -169,11 +168,8 @@ async def perform_http_request(
             data=data,
             headers=headers,
         )
-        method = "POST"
     else:
         http_events = await client.get(url, headers=additional_headers)
-        method = "GET"
-    elapsed = time.time() - start
 
     result = bytes()
     headers = {}
@@ -197,7 +193,7 @@ async def async_h3_query(
     post: bool,
     create_protocol=HttpClient,
     additional_headers: Optional[Dict] = None,
-) -> None:
+) -> Union[Tuple[str, Dict[str, str]], Tuple[asyncio.TimeoutError, Dict[str, str]]]:
 
     url = baseurl
     if not post:
index b4ec180722869ed750c2d9f5c6a3e7533b06f409..9d4b6ee82adad5878d78f63a1d58b1de9bafbf8e 100644 (file)
@@ -65,7 +65,6 @@ class QUICTests(object):
         """
         name = 'drop.doq.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN')
-        dropped = False
         try:
             (_, receivedResponse) = self.sendQUICQuery(query, response=None, useQueue=False)
             self.assertTrue(False)
@@ -111,7 +110,6 @@ class QUICTests(object):
         """
         name = 'no-backend.doq.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN', use_edns=False)
-        dropped = False
         try:
             (_, receivedResponse) = self.sendQUICQuery(query, response=None, useQueue=False)
             self.assertTrue(False)
index 9afc1f4f5fe39211bf6db50c6ab9156cf375af4e..b07f6f8ee45da82c9549bb71557f62456d60f0d5 100644 (file)
@@ -485,7 +485,6 @@ class TestAPIWritable(APITestsBase):
 
         configFile = self._APIWriteDir + '/' + 'acl.conf'
         self.assertTrue(os.path.isfile(configFile))
-        fileContent = None
         with open(configFile, 'rt') as f:
             header = f.readline()
             body = f.readline()
index babf7399b3516fd88b112a01c7d8e033246a8a33..570a7f49a0c52f5777eb75ccff9ffa0ebda893be 100644 (file)
@@ -537,7 +537,6 @@ class TestAdvancedDropEmptyQueries(DNSDistTest):
         """
         Advanced: Drop empty queries
         """
-        name = 'drop-empty-queries.advanced.tests.powerdns.com.'
         query = dns.message.Message()
 
         for method in ("sendUDPQuery", "sendTCPQuery"):
index 6292ab75b005d675af2d51e520eb0f074633d179..45b58636551da51dccd09944808cafa69d120ba9 100644 (file)
@@ -426,7 +426,6 @@ class TestBasics(DNSDistTest):
         """
         Basic: NotImp on empty queries
         """
-        name = 'notimp-empty-queries.basic.tests.powerdns.com.'
         query = dns.message.Message()
 
         response = dns.message.make_response(query)
index 05f96d94e42768dcf618d1e6c506b917c992b1fb..e8e74168b8ff6dab898c3c5f088049e65afa8090 100644 (file)
@@ -427,7 +427,6 @@ class TestDNSCryptAutomaticRotation(DNSCryptTest):
             client.refreshResolverCertificates()
             cert = client.getResolverCertificate()
             self.assertTrue(cert)
-            secondSerial = cert.serial
             self.assertGreater(cert.serial, serials[client])
 
         name = 'automatic-rotation.dnscrypt.tests.powerdns.com.'
index a7429bf00515788f8031749ff1ba64507ede3070..d7bfc10276553da887df1864b62c3379cbef853c 100644 (file)
@@ -248,7 +248,6 @@ class DOHTests(object):
         """
         DOH: Empty GET query
         """
-        name = 'empty-get.doh.tests.powerdns.com.'
         url = self._dohBaseURL
         conn = self.openDOHConnection(self._dohServerPort, self._caCert, timeout=2.0)
         conn.setopt(pycurl.URL, url)
@@ -256,7 +255,7 @@ class DOHTests(object):
         conn.setopt(pycurl.SSL_VERIFYPEER, 1)
         conn.setopt(pycurl.SSL_VERIFYHOST, 2)
         conn.setopt(pycurl.CAINFO, self._caCert)
-        data = conn.perform_rb()
+        conn.perform_rb()
         rcode = conn.getinfo(pycurl.RESPONSE_CODE)
         self.assertEqual(rcode, 400)
 
@@ -266,7 +265,6 @@ class DOHTests(object):
         """
         if self._dohLibrary == 'h2o':
             raise unittest.SkipTest('h2o tries to parse the qname early, so this check will fail')
-        name = 'zero-qdcount.doh.tests.powerdns.com.'
         query = dns.message.Message()
         query.id = 0
         query.flags &= ~dns.flags.RD
@@ -280,7 +278,6 @@ class DOHTests(object):
         """
         DOH: Short path in GET query
         """
-        name = 'short-path-get.doh.tests.powerdns.com.'
         url = self._dohBaseURL + '/AA'
         conn = self.openDOHConnection(self._dohServerPort, self._caCert, timeout=2.0)
         conn.setopt(pycurl.URL, url)
@@ -288,7 +285,7 @@ class DOHTests(object):
         conn.setopt(pycurl.SSL_VERIFYPEER, 1)
         conn.setopt(pycurl.SSL_VERIFYHOST, 2)
         conn.setopt(pycurl.CAINFO, self._caCert)
-        data = conn.perform_rb()
+        conn.perform_rb()
         rcode = conn.getinfo(pycurl.RESPONSE_CODE)
         self.assertEqual(rcode, 404)
 
@@ -307,7 +304,7 @@ class DOHTests(object):
         conn.setopt(pycurl.SSL_VERIFYPEER, 1)
         conn.setopt(pycurl.SSL_VERIFYHOST, 2)
         conn.setopt(pycurl.CAINFO, self._caCert)
-        data = conn.perform_rb()
+        conn.perform_rb()
         rcode = conn.getinfo(pycurl.RESPONSE_CODE)
         self.assertEqual(rcode, 400)
 
@@ -317,7 +314,6 @@ class DOHTests(object):
         """
         name = 'invalid-b64-get.doh.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN', use_edns=False)
-        wire = query.to_wire()
         url = self._dohBaseURL + '?dns=' + '_-~~~~-_'
         conn = self.openDOHConnection(self._dohServerPort, self._caCert, timeout=2.0)
         conn.setopt(pycurl.URL, url)
@@ -325,7 +321,7 @@ class DOHTests(object):
         conn.setopt(pycurl.SSL_VERIFYPEER, 1)
         conn.setopt(pycurl.SSL_VERIFYHOST, 2)
         conn.setopt(pycurl.CAINFO, self._caCert)
-        data = conn.perform_rb()
+        conn.perform_rb()
         rcode = conn.getinfo(pycurl.RESPONSE_CODE)
         self.assertEqual(rcode, 400)
 
@@ -345,7 +341,7 @@ class DOHTests(object):
         conn.setopt(pycurl.SSL_VERIFYPEER, 1)
         conn.setopt(pycurl.SSL_VERIFYHOST, 2)
         conn.setopt(pycurl.CAINFO, self._caCert)
-        data = conn.perform_rb()
+        conn.perform_rb()
         rcode = conn.getinfo(pycurl.RESPONSE_CODE)
         self.assertEqual(rcode, 400)
 
@@ -367,7 +363,7 @@ class DOHTests(object):
         conn.setopt(pycurl.SSL_VERIFYHOST, 2)
         conn.setopt(pycurl.CAINFO, self._caCert)
         conn.setopt(pycurl.CUSTOMREQUEST, 'PATCH')
-        data = conn.perform_rb()
+        conn.perform_rb()
         rcode = conn.getinfo(pycurl.RESPONSE_CODE)
         self.assertEqual(rcode, 400)
 
@@ -526,7 +522,7 @@ class DOHTests(object):
         conn.setopt(pycurl.SSL_VERIFYPEER, 1)
         conn.setopt(pycurl.SSL_VERIFYHOST, 2)
         conn.setopt(pycurl.CAINFO, self._caCert)
-        data = conn.perform_rb()
+        conn.perform_rb()
         rcode = conn.getinfo(pycurl.RESPONSE_CODE)
         self.assertEqual(rcode, 403)
 
@@ -1653,7 +1649,6 @@ class DOHFrontendLimits(object):
         """
         DoH Frontend Limits: Maximum number of conns per DoH frontend
         """
-        name = 'maxconnsperfrontend.doh.tests.powerdns.com.'
         query = b"GET / HTTP/1.0\r\n\r\n"
         conns = []
 
@@ -1869,8 +1864,8 @@ class DOHLimits(object):
         failed = 0
         for conn in conns:
             try:
-                data = conn.perform_rb()
-                rcode = conn.getinfo(pycurl.RESPONSE_CODE)
+                conn.perform_rb()
+                conn.getinfo(pycurl.RESPONSE_CODE)
                 count = count + 1
             except:
                 failed = failed + 1
@@ -1913,7 +1908,6 @@ class DOHXFR(object):
         name = 'xfr.doh.tests.powerdns.com.'
         for xfrType in [dns.rdatatype.AXFR, dns.rdatatype.IXFR]:
             query = dns.message.make_query(name, xfrType, 'IN')
-            url = self.getDOHGetURL(self._dohBaseURL, query)
 
             expectedResponse = dns.message.make_response(query)
             expectedResponse.set_rcode(dns.rcode.NOTIMP)
index 7d7aacc681b969fdf9b596e44d3812545b5a7d74..c8d05a71330faf0f25202187cbd2d3aa080d2e7e 100644 (file)
@@ -34,7 +34,7 @@ class TestDOQBogus(DNSDistTest):
         expectedQuery.id = 0
 
         try:
-            message = quic_bogus_query(query, '127.0.0.1', 2.0, self._doqServerPort, verify=self._caCert, server_hostname=self._serverName)
+            quic_bogus_query(query, '127.0.0.1', 2.0, self._doqServerPort, verify=self._caCert, server_hostname=self._serverName)
             self.assertFalse(True)
         except doqclient.StreamResetError as e :
             self.assertEqual(e.error, 2);
index 4629fcd9681fb13ef81507b8fd432f6f3507796c..e790e48072828229daa10c65ebda77d08d037129 100644 (file)
@@ -1215,7 +1215,6 @@ class TestProtobufAXFR(DNSDistProtobufTest):
         while not self._protobufQueue.empty():
             msg = self.getFirstProtobufMessage()
             count = count + 1
-            pbMessageType = dnsmessage_pb2.PBDNSMessage.TCP
             self.checkProtobufResponse(msg, dnsmessage_pb2.PBDNSMessage.TCP, responses[count-1])
 
             expected = responses[count-1].answer[0]
index a039709f2f30e866b46e047112221e594cf999ce..1b96ab8a3dcd3d8206de594633113a1001c42643 100644 (file)
@@ -754,8 +754,6 @@ class TestProxyProtocolIncoming(ProxyProtocolTest):
 
         toProxyQueue.put(response, True, 2.0)
 
-        wire = query.to_wire()
-
         reverseProxyPort = pickAvailablePort()
         reverseProxy = threading.Thread(name='Mock Proxy Protocol Reverse Proxy', target=MockTCPReverseProxyAddingProxyProtocol, args=[reverseProxyPort, self._dohServerPPOutsidePort])
         reverseProxy.start()
@@ -804,8 +802,6 @@ class TestProxyProtocolIncoming(ProxyProtocolTest):
 
         toProxyQueue.put(response, True, 2.0)
 
-        wire = query.to_wire()
-
         reverseProxyPort = pickAvailablePort()
         tlsContext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
         tlsContext.load_cert_chain(self._serverCert, self._serverKey)
@@ -857,8 +853,6 @@ class TestProxyProtocolIncoming(ProxyProtocolTest):
 
         toProxyQueue.put(response, True, 2.0)
 
-        wire = query.to_wire()
-
         reverseProxyPort = pickAvailablePort()
         reverseProxy = threading.Thread(name='Mock Proxy Protocol Reverse Proxy', target=MockTCPReverseProxyAddingProxyProtocol, args=[reverseProxyPort, self._dotServerPPOutsidePort])
         reverseProxy.start()
@@ -907,8 +901,6 @@ class TestProxyProtocolIncoming(ProxyProtocolTest):
 
         toProxyQueue.put(response, True, 2.0)
 
-        wire = query.to_wire()
-
         reverseProxyPort = pickAvailablePort()
         tlsContext = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
         tlsContext.load_cert_chain(self._serverCert, self._serverKey)
@@ -1066,7 +1058,6 @@ class TestProxyProtocolIncomingValuesViaLua(DNSDistTest):
             query = dns.message.make_query(name, 'A', 'IN')
             # dnsdist set RA = RD for spoofed responses
             query.flags &= ~dns.flags.RD
-            response = dns.message.make_response(query)
 
             expectedResponse = dns.message.make_response(query)
             rrset = dns.rrset.from_text(name,
index 8e143e3b10fd6a40a25f807163112fe0a24dd84a..46f250f170e3d94323a86b872b2ca1d2b44e67a4 100644 (file)
@@ -313,7 +313,6 @@ class TestRoutingRoundRobinLBAllDown(DNSDistTest):
         """
         Routing: Round Robin with all servers down
         """
-        numberOfQueries = 10
         name = 'alldown.rr.routing.tests.powerdns.com.'
         query = dns.message.make_query(name, 'A', 'IN')
         response = dns.message.make_response(query)
@@ -486,7 +485,6 @@ class TestRoutingOrder(DNSDistTest):
                 self.assertEqual(query, receivedQuery)
                 self.assertEqual(response, receivedResponse)
 
-        total = 0
         if 'UDP Responder' in self._responsesCounter:
             self.assertEqual(self._responsesCounter['UDP Responder'], 0)
         self.assertEqual(self._responsesCounter['UDP Responder 2'], numberOfQueries)
index d456852786bc2fd5b8a7b446af2742bc761c6dda..853478b30b0e348fb9e0157e6c8e7908d9f28e9d 100644 (file)
@@ -227,7 +227,6 @@ class TestTCPKeepAlive(DNSDistTest):
         numQueriesPerConn = 4
 
         conns = []
-        start = time.time()
         for idx in range(numConns):
             conns.append(self.openTCPConnection())
 
index 7ecdcf6f9a1df295058142655f23cb299ed56366..974a4f10815ad8e0ee71e7dcef59ec0c9b1a7142 100644 (file)
@@ -109,7 +109,6 @@ class TestTCPLimits(DNSDistTest):
         """
         TCP Limits: Maximum duration
         """
-        name = 'duration.tcp.tests.powerdns.com.'
 
         start = time.time()
         conn = self.openTCPConnection()