From: Gursharan Singh <3442979+G8XSU@users.noreply.github.com>
Date: Fri, 18 Oct 2024 21:35:49 +0000 (-0700)
Subject: Merge pull request #3359 from TheBlueMatt/2024-10-less-types-re-export
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=608209ef19b0b30d8728ab97f2dfe219c3e2a25d;p=rust-lightning

Merge pull request #3359 from TheBlueMatt/2024-10-less-types-re-export

Remove deprecated re-exports
---

608209ef19b0b30d8728ab97f2dfe219c3e2a25d
diff --cc lightning/src/chain/package.rs
index aefd1c5de,1b96acd67..f5745e93d
--- a/lightning/src/chain/package.rs
+++ b/lightning/src/chain/package.rs
@@@ -24,11 -24,10 +24,11 @@@ use bitcoin::secp256k1::{SecretKey,Publ
  use bitcoin::sighash::EcdsaSighashType;
  use bitcoin::transaction::Version;
  
- use crate::ln::types::PaymentPreimage;
+ use crate::types::payment::PaymentPreimage;
  use crate::ln::chan_utils::{self, TxCreationKeys, HTLCOutputInCommitment};
- use crate::ln::features::ChannelTypeFeatures;
+ use crate::types::features::ChannelTypeFeatures;
  use crate::ln::channel_keys::{DelayedPaymentBasepoint, HtlcBasepoint};
 +use crate::ln::channelmanager::MIN_CLTV_EXPIRY_DELTA;
  use crate::ln::msgs::DecodeError;
  use crate::chain::chaininterface::{FeeEstimator, ConfirmationTarget, MIN_RELAY_FEE_SAT_PER_1000_WEIGHT, compute_feerate_sat_per_1000_weight, FEERATE_FLOOR_SATS_PER_KW};
  use crate::chain::transaction::MaybeSignedTransaction;