f Account for lightning::util::string re-exports being dropped

Author: tnull

src/ffi/types.rs

@@ -28,7 +28,7 @@ pub use lightning::ln::types::ChannelId;
 pub use lightning::offers::offer::OfferId;
 pub use lightning::routing::gossip::{NodeAlias, NodeId, RoutingFees};
 pub use lightning::routing::router::RouteParametersConfig;
-pub use lightning::util::string::UntrustedString;
+pub use lightning_types::string::UntrustedString;
 
 pub use lightning_types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
 

src/io/sqlite_store/mod.rs

@@ -10,7 +10,8 @@ use crate::io::utils::check_namespace_key_validity;
 
 use lightning::io;
 use lightning::util::persist::KVStore;
-use lightning::util::string::PrintableString;
+
+use lightning_types::string::PrintableString;
 
 use rusqlite::{named_params, Connection};
 

src/io/utils.rs

@@ -31,9 +31,10 @@ use lightning::util::persist::{
 	SCORER_PERSISTENCE_PRIMARY_NAMESPACE, SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
 };
 use lightning::util::ser::{Readable, ReadableArgs, Writeable};
-use lightning::util::string::PrintableString;
 use lightning::util::sweep::OutputSweeper;
 
+use lightning_types::string::PrintableString;
+
 use bdk_chain::indexer::keychain_txout::ChangeSet as BdkIndexerChangeSet;
 use bdk_chain::local_chain::ChangeSet as BdkLocalChainChangeSet;
 use bdk_chain::miniscript::{Descriptor, DescriptorPublicKey};

src/payment/bolt12.rs

@@ -20,7 +20,8 @@ use lightning::ln::channelmanager::{PaymentId, Retry};
 use lightning::offers::offer::{Amount, Offer as LdkOffer, Quantity};
 use lightning::offers::parse::Bolt12SemanticError;
 use lightning::routing::router::RouteParametersConfig;
-use lightning::util::string::UntrustedString;
+
+use lightning_types::string::UntrustedString;
 
 use rand::RngCore;
 

src/payment/store.rs

@@ -9,13 +9,13 @@ use lightning::ln::channelmanager::PaymentId;
 use lightning::ln::msgs::DecodeError;
 use lightning::offers::offer::OfferId;
 use lightning::util::ser::{Readable, Writeable};
-use lightning::util::string::UntrustedString;
 use lightning::{
 	_init_and_read_len_prefixed_tlv_fields, impl_writeable_tlv_based,
 	impl_writeable_tlv_based_enum, write_tlv_fields,
 };
 
 use lightning_types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
+use lightning_types::string::UntrustedString;
 
 use bitcoin::{BlockHash, Txid};