Merge pull request #3914 from TheBlueMatt/2025-06-3251

Remove deprecated `lightning::util::string` re-exports

Author: wpaulino

fuzz/src/invoice_request_deser.rs

@@ -24,8 +24,8 @@ use lightning::offers::parse::Bolt12SemanticError;
 use lightning::sign::EntropySource;
 use lightning::types::features::BlindedHopFeatures;
 use lightning::types::payment::{PaymentHash, PaymentSecret};
+use lightning::types::string::UntrustedString;
 use lightning::util::ser::Writeable;
-use lightning::util::string::UntrustedString;
 
 #[inline]
 pub fn do_test<Out: test_logger::Output>(data: &[u8], _out: Out) {

lightning-persister/src/fs_store.rs

@@ -1,8 +1,8 @@
 //! Objects related to [`FilesystemStore`] live here.
 use crate::utils::{check_namespace_key_validity, is_valid_kvstore_str};
 
+use lightning::types::string::PrintableString;
 use lightning::util::persist::{KVStore, MigratableKVStore};
-use lightning::util::string::PrintableString;
 
 use std::collections::HashMap;
 use std::fs;

lightning-persister/src/utils.rs

@@ -1,5 +1,5 @@
+use lightning::types::string::PrintableString;
 use lightning::util::persist::{KVSTORE_NAMESPACE_KEY_ALPHABET, KVSTORE_NAMESPACE_KEY_MAX_LEN};
-use lightning::util::string::PrintableString;
 
 pub(crate) fn is_valid_kvstore_str(key: &str) -> bool {
 	key.len() <= KVSTORE_NAMESPACE_KEY_MAX_LEN

lightning/src/events/mod.rs

@@ -35,12 +35,12 @@ use crate::routing::router::{BlindedTail, Path, RouteHop, RouteParameters};
 use crate::sign::SpendableOutputDescriptor;
 use crate::types::features::ChannelTypeFeatures;
 use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
+use crate::types::string::UntrustedString;
 use crate::util::errors::APIError;
 use crate::util::ser::{
 	BigSize, FixedLengthReader, MaybeReadable, Readable, RequiredWrapper, UpgradableRequired,
 	WithoutLength, Writeable, Writer,
 };
-use crate::util::string::UntrustedString;
 
 use crate::io;
 use crate::sync::Arc;
@@ -315,7 +315,7 @@ pub enum ClosureReason {
 		/// a security vulnerability in the terminal emulator or the logging subsystem.
 		/// To be safe, use `Display` on `UntrustedString`
 		///
-		/// [`UntrustedString`]: crate::util::string::UntrustedString
+		/// [`UntrustedString`]: crate::types::string::UntrustedString
 		peer_msg: UntrustedString,
 	},
 	/// Closure generated from [`ChannelManager::force_close_channel`], called by the user.

lightning/src/ln/channelmanager.rs

@@ -119,6 +119,7 @@ use crate::types::features::{
 	Bolt12InvoiceFeatures, ChannelFeatures, ChannelTypeFeatures, InitFeatures, NodeFeatures,
 };
 use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
+use crate::types::string::UntrustedString;
 use crate::util::config::{ChannelConfig, ChannelConfigOverrides, ChannelConfigUpdate, UserConfig};
 use crate::util::errors::APIError;
 use crate::util::logger::{Level, Logger, WithContext};
@@ -127,7 +128,6 @@ use crate::util::ser::{
 	BigSize, FixedLengthReader, LengthReadable, MaybeReadable, Readable, ReadableArgs, VecWriter,
 	Writeable, Writer,
 };
-use crate::util::string::UntrustedString;
 use crate::util::wakers::{Future, Notifier};
 
 #[cfg(all(test, async_payments))]

lightning/src/ln/functional_tests.rs

@@ -52,13 +52,13 @@ use crate::routing::router::{
 use crate::sign::{EntropySource, OutputSpender, SignerProvider};
 use crate::types::features::{ChannelFeatures, ChannelTypeFeatures, NodeFeatures};
 use crate::types::payment::{PaymentHash, PaymentSecret};
+use crate::types::string::UntrustedString;
 use crate::util::config::{
 	ChannelConfigOverrides, ChannelConfigUpdate, ChannelHandshakeConfigUpdate, MaxDustHTLCExposure,
 	UserConfig,
 };
 use crate::util::errors::APIError;
 use crate::util::ser::{ReadableArgs, Writeable};
-use crate::util::string::UntrustedString;
 use crate::util::test_channel_signer::TestChannelSigner;
 use crate::util::test_utils::{self, TestLogger, WatchtowerPersister};
 

lightning/src/ln/payment_tests.rs

@@ -44,9 +44,9 @@ use crate::routing::scoring::ChannelUsage;
 use crate::sign::EntropySource;
 use crate::types::features::{Bolt11InvoiceFeatures, ChannelTypeFeatures};
 use crate::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
+use crate::types::string::UntrustedString;
 use crate::util::errors::APIError;
 use crate::util::ser::Writeable;
-use crate::util::string::UntrustedString;
 use crate::util::test_utils;
 
 use bitcoin::hashes::sha256::Hash as Sha256;

lightning/src/ln/peer_handler.rs

@@ -45,10 +45,10 @@ use crate::onion_message::packet::OnionMessageContents;
 use crate::routing::gossip::{NodeAlias, NodeId};
 use crate::sign::{NodeSigner, Recipient};
 use crate::types::features::{InitFeatures, NodeFeatures};
+use crate::types::string::PrintableString;
 use crate::util::atomic_counter::AtomicCounter;
 use crate::util::logger::{Level, Logger, WithContext};
 use crate::util::ser::{VecWriter, Writeable, Writer};
-use crate::util::string::PrintableString;
 
 #[allow(unused_imports)]
 use crate::prelude::*;

lightning/src/ln/reload_tests.rs

@@ -509,7 +509,7 @@ fn test_manager_serialize_deserialize_inconsistent_monitor() {
 #[cfg(feature = "std")]
 fn do_test_data_loss_protect(reconnect_panicing: bool, substantially_old: bool, not_stale: bool) {
 	use crate::ln::channelmanager::Retry;
-	use crate::util::string::UntrustedString;
+	use crate::types::string::UntrustedString;
 	// When we get a data_loss_protect proving we're behind, we immediately panic as the
 	// chain::Watch API requirements have been violated (e.g. the user restored from a backup). The
 	// panic message informs the user they should force-close without broadcasting, which is tested

lightning/src/ln/reorg_tests.rs

@@ -19,8 +19,8 @@ use crate::events::{Event, ClosureReason, HTLCHandlingFailureType};
 use crate::ln::msgs::{BaseMessageHandler, ChannelMessageHandler, Init, MessageSendEvent};
 use crate::ln::types::ChannelId;
 use crate::sign::OutputSpender;
+use crate::types::string::UntrustedString;
 use crate::util::ser::Writeable;
-use crate::util::string::UntrustedString;
 
 use bitcoin::script::Builder;
 use bitcoin::opcodes;