[PR #2893] [MERGED] server: simplify module structure #3400

New issue

Closed

opened 2026-03-16 11:41:44 +03:00 by kerem · 0 comments

kerem commented

2026-03-16 11:41:44 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/hickory-dns/hickory-dns/pull/2893
Author: @djc
Created: 3/30/2025
Status: ✅ Merged
Merged: 3/31/2025
Merged by: @djc

Base: main ← Head: server-structure

📝 Commits (10+)

422e22c server: use exported names directly
ed8cc0b server: avoid small module indirection
caf1c2b server: move error module
c584ef4 server: keep TimeoutStream tests local
08e1229 server: fold server_future module into server
d80869a server: inline trivial wrapper functions
0b53365 server: merge error module into authority
f8bf32b server: use inline module for zone_type
46feeb3 server: merge blocklist store modules
385c7d2 server: use single file blocklist module

📊 Changes

26 files changed (+3111 additions, -3283 deletions)

View changed files

📝 bin/tests/integration/main.rs (+0 -1)
➖ bin/tests/integration/timeout_stream_tests.rs (+0 -60)
➖ crates/server/src/authority/error.rs (+0 -133)
📝 crates/server/src/authority/mod.rs (+164 -9)
➖ crates/server/src/authority/zone_type.rs (+0 -37)
➕ crates/server/src/error.rs (+182 -0)
➖ crates/server/src/error/config_error.rs (+0 -79)
➖ crates/server/src/error/mod.rs (+0 -26)
➖ crates/server/src/error/persistence_error.rs (+0 -104)
📝 crates/server/src/server/h2_handler.rs (+11 -28)
📝 crates/server/src/server/h3_handler.rs (+5 -19)
📝 crates/server/src/server/mod.rs (+1325 -5)
📝 crates/server/src/server/quic_handler.rs (+11 -19)
➖ crates/server/src/server/server_future.rs (+0 -1329)
📝 crates/server/src/server/timeout_stream.rs (+59 -0)
📝 crates/server/src/store/blocklist.rs (+76 -1)
➖ crates/server/src/store/blocklist/mod.rs (+0 -85)
📝 crates/server/src/store/file.rs (+12 -3)
➖ crates/server/src/store/file/mod.rs (+0 -23)
📝 crates/server/src/store/forwarder.rs (+22 -7)

...and 6 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/hickory-dns/hickory-dns/pull/2893 **Author:** [@djc](https://github.com/djc) **Created:** 3/30/2025 **Status:** ✅ Merged **Merged:** 3/31/2025 **Merged by:** [@djc](https://github.com/djc) **Base:** `main` ← **Head:** `server-structure` --- ### 📝 Commits (10+) - [`422e22c`](https://github.com/hickory-dns/hickory-dns/commit/422e22c25dcab9b103bab66b0db5710f7334d8d5) server: use exported names directly - [`ed8cc0b`](https://github.com/hickory-dns/hickory-dns/commit/ed8cc0bf0f81eccc8db52e41b97ac856328a8c0e) server: avoid small module indirection - [`caf1c2b`](https://github.com/hickory-dns/hickory-dns/commit/caf1c2bd10b4c18efbc7132d14578eabda7810ff) server: move error module - [`c584ef4`](https://github.com/hickory-dns/hickory-dns/commit/c584ef4de927bd53ed83b10ade27f5b1e7ebf940) server: keep TimeoutStream tests local - [`08e1229`](https://github.com/hickory-dns/hickory-dns/commit/08e1229f3fb6017fa20aebf0910fb312007dc0d7) server: fold server_future module into server - [`d80869a`](https://github.com/hickory-dns/hickory-dns/commit/d80869a174d6ee11e34cf6582fcde06e1785664c) server: inline trivial wrapper functions - [`0b53365`](https://github.com/hickory-dns/hickory-dns/commit/0b5336537bf9f0fbd93f6eb437f142e14efc0075) server: merge error module into authority - [`f8bf32b`](https://github.com/hickory-dns/hickory-dns/commit/f8bf32b1b37f1b3048312eab996afb4c77fc08f4) server: use inline module for zone_type - [`46feeb3`](https://github.com/hickory-dns/hickory-dns/commit/46feeb3262839c6dcecf3903358650766dd94a12) server: merge blocklist store modules - [`385c7d2`](https://github.com/hickory-dns/hickory-dns/commit/385c7d2df89da2a3596e7ded9aa2a56b49c1e1db) server: use single file blocklist module ### 📊 Changes **26 files changed** (+3111 additions, -3283 deletions) <details> <summary>View changed files</summary> 📝 `bin/tests/integration/main.rs` (+0 -1) ➖ `bin/tests/integration/timeout_stream_tests.rs` (+0 -60) ➖ `crates/server/src/authority/error.rs` (+0 -133) 📝 `crates/server/src/authority/mod.rs` (+164 -9) ➖ `crates/server/src/authority/zone_type.rs` (+0 -37) ➕ `crates/server/src/error.rs` (+182 -0) ➖ `crates/server/src/error/config_error.rs` (+0 -79) ➖ `crates/server/src/error/mod.rs` (+0 -26) ➖ `crates/server/src/error/persistence_error.rs` (+0 -104) 📝 `crates/server/src/server/h2_handler.rs` (+11 -28) 📝 `crates/server/src/server/h3_handler.rs` (+5 -19) 📝 `crates/server/src/server/mod.rs` (+1325 -5) 📝 `crates/server/src/server/quic_handler.rs` (+11 -19) ➖ `crates/server/src/server/server_future.rs` (+0 -1329) 📝 `crates/server/src/server/timeout_stream.rs` (+59 -0) 📝 `crates/server/src/store/blocklist.rs` (+76 -1) ➖ `crates/server/src/store/blocklist/mod.rs` (+0 -85) 📝 `crates/server/src/store/file.rs` (+12 -3) ➖ `crates/server/src/store/file/mod.rs` (+0 -23) 📝 `crates/server/src/store/forwarder.rs` (+22 -7) _...and 6 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>