From 115c9dd17ccc7888faeb2ae88ab6584e3cfc9c29 Mon Sep 17 00:00:00 2001 From: DeFiDude <59237470+DeFiDude@users.noreply.github.com> Date: Sun, 26 Jul 2026 02:55:35 -0600 Subject: [PATCH] lxmd: restore Python delivery limit default --- README.md | 2 +- crates/lxmf-tools/src/commands/lxmd.rs | 6 +++--- crates/lxmf-tools/src/daemon.rs | 10 +++++----- crates/lxmf-tools/src/lxmd_cli.rs | 2 +- crates/lxmf-tools/tests/lxmd_cli.rs | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 377b221..7126562 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,7 @@ Minimal config: display_name = Rat announce_at_start = no # stamp_cost = 12 -delivery_transfer_max_accepted_size = 1 +delivery_transfer_max_accepted_size = 1000 # on_inbound = /path/to/handler [propagation] diff --git a/crates/lxmf-tools/src/commands/lxmd.rs b/crates/lxmf-tools/src/commands/lxmd.rs index e77e946..1242dcd 100644 --- a/crates/lxmf-tools/src/commands/lxmd.rs +++ b/crates/lxmf-tools/src/commands/lxmd.rs @@ -4186,9 +4186,9 @@ mod tests { #[test] fn delivery_resource_admission_uses_decimal_kilobytes_with_exact_boundary() { let default_limit = DaemonConfig::default().delivery_transfer_max_accepted_size; - assert_eq!(default_limit, 1.0); - assert!(accepts_delivery_resource(1000, default_limit)); - assert!(!accepts_delivery_resource(1001, default_limit)); + assert_eq!(default_limit, 1000.0); + assert!(accepts_delivery_resource(1_000_000, default_limit)); + assert!(!accepts_delivery_resource(1_000_001, default_limit)); assert!(accepts_delivery_resource(380, 0.38)); assert!(!accepts_delivery_resource(381, 0.38)); diff --git a/crates/lxmf-tools/src/daemon.rs b/crates/lxmf-tools/src/daemon.rs index cea6f5a..b3e04a5 100644 --- a/crates/lxmf-tools/src/daemon.rs +++ b/crates/lxmf-tools/src/daemon.rs @@ -71,7 +71,7 @@ impl PythonLxmdConfig { delivery_transfer_max_accepted_size: get_float_or_floor( lxmf, "delivery_transfer_max_accepted_size", - 1.0, + 1000.0, 0.38, ), on_inbound: lxmf @@ -227,7 +227,7 @@ impl Default for DaemonConfig { enforce_stamps: false, message_storage_limit: Some(500_000_000), from_static_only: false, - delivery_transfer_max_accepted_size: 1.0, + delivery_transfer_max_accepted_size: 1000.0, } } } @@ -452,7 +452,7 @@ mod tests { assert!(!dc.node_announce_at_start); assert_eq!(dc.node_announce_interval, None); assert_eq!(dc.message_storage_limit, Some(500_000_000)); - assert_eq!(dc.delivery_transfer_max_accepted_size, 1.0); + assert_eq!(dc.delivery_transfer_max_accepted_size, 1000.0); assert!(!dc.from_static_only); } @@ -465,7 +465,7 @@ mod tests { assert!(!py.peer_announce_at_start); assert_eq!(py.peer_announce_interval, None); assert_eq!(py.peer_stamp_cost, 12); - assert_eq!(py.delivery_transfer_max_accepted_size, 1.0); + assert_eq!(py.delivery_transfer_max_accepted_size, 1000.0); assert_eq!(py.on_inbound, None); assert!(!py.enable_propagation_node); assert_eq!(py.node_name, None); @@ -588,7 +588,7 @@ propagation_transfer_max_accepted_size = 12 let rc = dc.to_router_config(); assert!(!rc.propagation_enabled); assert_eq!(rc.max_peers, 20); - assert_eq!(rc.delivery_limit_kb, 1.0); + assert_eq!(rc.delivery_limit_kb, 1000.0); assert_eq!(RouterConfig::default().delivery_limit_kb, 1000.0); assert_eq!(rc.propagation_limit_kb, 256); assert_eq!(rc.sync_limit_kb, 10_240); diff --git a/crates/lxmf-tools/src/lxmd_cli.rs b/crates/lxmf-tools/src/lxmd_cli.rs index bdbb5ac..5cce1cd 100644 --- a/crates/lxmf-tools/src/lxmd_cli.rs +++ b/crates/lxmf-tools/src/lxmd_cli.rs @@ -224,7 +224,7 @@ announce_at_start = no # stamp_cost = 12 -delivery_transfer_max_accepted_size = 1 +delivery_transfer_max_accepted_size = 1000 # on_inbound = /path/to/handler diff --git a/crates/lxmf-tools/tests/lxmd_cli.rs b/crates/lxmf-tools/tests/lxmd_cli.rs index 78c9a78..d2a6702 100644 --- a/crates/lxmf-tools/tests/lxmd_cli.rs +++ b/crates/lxmf-tools/tests/lxmd_cli.rs @@ -228,7 +228,7 @@ fn example_config_exits_before_runtime_initialisation() { assert!(text.contains("display_name = Anonymous Peer")); assert!(text.contains("announce_at_start = no")); assert!(text.contains("# stamp_cost = 12")); - assert!(text.contains("delivery_transfer_max_accepted_size = 1")); + assert!(text.contains("delivery_transfer_max_accepted_size = 1000")); assert!(text.contains("[propagation]")); assert!(text.contains("enable_node = no")); assert!(text.contains("announce_interval = 360"));