From 496563e7cfce4cf2cb971f126945f526e9b8c119 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 9 Aug 2022 12:02:53 +0100 Subject: [PATCH] channel padding: Abolish ARTI_EXPERIMENTAL_CHANNEL_PADDING env var This was for testing and is no longer needed. --- crates/tor-proto/src/channel/params.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/crates/tor-proto/src/channel/params.rs b/crates/tor-proto/src/channel/params.rs index 2fc26c23d..1cb4fb98a 100644 --- a/crates/tor-proto/src/channel/params.rs +++ b/crates/tor-proto/src/channel/params.rs @@ -157,7 +157,6 @@ macro_rules! define_channels_insns_and_automatic_impls { { $( define_channels_insns_and_automatic_impls! { /// Whether to send padding - #[field educe(Default(expression = "interim_enable_by_env_var()"))] padding_enable: bool, /// Padding timing parameters @@ -182,13 +181,6 @@ define_channels_insns_and_automatic_impls! { padding_negotiate: PaddingNegotiate, } -/// Placeholder function for saying whether to enable channel padding -/// -/// This will be abolished in due course. -pub(crate) fn interim_enable_by_env_var() -> bool { - std::env::var("ARTI_EXPERIMENTAL_CHANNEL_PADDING").unwrap_or_default() != "" -} - /// Builder for a channels padding instructions update /// /// Obtain this from `ChannelPaddingInstructions::update`,